Changeset 666:bee66d8ca38a in freeDiameter

Timestamp:

Jan 17, 2011, 11:22:35 AM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix include directories directives

Files:

• include/freeDiameter/CMakeLists.txt (modified) (4 diffs)
• libfdcore/CMakeLists.txt (modified) (1 diff)

include/freeDiameter/CMakeLists.txt

@@ -80 +80 @@
         IF(NOT HAVE_NATIVE_SCTP)
                 FIND_PACKAGE(SCTP REQUIRED)
-                INCLUDE_DIRECTORIES(${SCTP_INCLUDE_DIR})
         ENDIF(NOT HAVE_NATIVE_SCTP)
         # Now check the number of args of this function, since it changed between Ubuntu 9.04 and 9.10
@@ -100 +99 @@
 # Require GNU TLS for building the library
 FIND_PACKAGE(GnuTLS REQUIRED)
-INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIR})
 
 find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)
@@ -107 +105 @@
 Endif ( NOT GCRYPT_INCLUDE_DIR )
 MARK_AS_ADVANCED(GCRYPT_INCLUDE_DIR)
-INCLUDE_DIRECTORIES(${GCRYPT_INCLUDE_DIR})
 
 # Also we need libgcrypt to... display its version :(
@@ -120 +117 @@
 # LFDCORE_LIBS = libraries required by the libfdcore
 SET(LFDCORE_LIBS ${CMAKE_DL_LIBS} ${SCTP_LIBRARIES} ${GCRYPT_LIBRARY} ${GNUTLS_LIBRARIES} PARENT_SCOPE)
+SET(LFDCORE_INCLUDES ${SCTP_INCLUDE_DIR} ${GNUTLS_INCLUDE_DIR} ${GCRYPT_INCLUDE_DIR} PARENT_SCOPE)
 
 ##########################

libfdcore/CMakeLists.txt

@@ -49 +49 @@
 SET(FDCORE_GEN_SRC ${FDCORE_GEN_SRC} PARENT_SCOPE)
 
+# Include path
+INCLUDE_DIRECTORIES(${LFDCORE_INCLUDES})
 
 # Build the executable