changeset 667:1f7c7ce85db3

More cleanups in the CMakeLists files
author Sebastien Decugis <sdecugis@nict.go.jp>
date Mon, 17 Jan 2011 13:03:14 +0900
parents bee66d8ca38a
children 4ef3b7cdf734
files extensions/CMakeLists.txt freeDiameterd/CMakeLists.txt tests/CMakeLists.txt
diffstat 3 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/CMakeLists.txt	Mon Jan 17 11:22:35 2011 +0900
+++ b/extensions/CMakeLists.txt	Mon Jan 17 13:03:14 2011 +0900
@@ -27,14 +27,7 @@
 OPTION(ALL_EXTENSIONS "Build ALL available extensions? (disable to select individual components)" OFF)
 
 # The extensions include the headers of freeDiameter that contains gnutls objects
-FIND_PACKAGE(GnuTLS REQUIRED)
-INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIR})
-find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)
-If ( NOT GCRYPT_INCLUDE_DIR )
-	MESSAGE(SEND_ERROR "Unable to find gcrypt.h, please install libgcrypt-dev or equivalent")
-Endif ( NOT GCRYPT_INCLUDE_DIR )
-MARK_AS_ADVANCED(GCRYPT_INCLUDE_DIR)
-INCLUDE_DIRECTORIES(${GCRYPT_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LFDCORE_INCLUDES})
 
 
 ###########################
--- a/freeDiameterd/CMakeLists.txt	Mon Jan 17 11:22:35 2011 +0900
+++ b/freeDiameterd/CMakeLists.txt	Mon Jan 17 13:03:14 2011 +0900
@@ -1,6 +1,9 @@
 # The subproject name
 Project("freeDiameter simple daemon" C)
 
+# Since it uses the libfdcore.h, it needs the include dependencies
+INCLUDE_DIRECTORIES(${LFDCORE_INCLUDES})
+
 # Build the executable
 ADD_EXECUTABLE(freeDiameterd main.c)
 
--- a/tests/CMakeLists.txt	Mon Jan 17 11:22:35 2011 +0900
+++ b/tests/CMakeLists.txt	Mon Jan 17 13:03:14 2011 +0900
@@ -29,6 +29,7 @@
 
 INCLUDE_DIRECTORIES( "../libfdproto" )
 INCLUDE_DIRECTORIES( "../libfdcore" )
+INCLUDE_DIRECTORIES(${LFDCORE_INCLUDES})
 
 
 ##############################
"Welcome to our mercurial repository"