Mercurial > hg > freeDiameter
changeset 666:bee66d8ca38a
Fix include directories directives
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Mon, 17 Jan 2011 11:22:35 +0900 |
| parents | 40d499a58376 |
| children | 1f7c7ce85db3 |
| files | include/freeDiameter/CMakeLists.txt libfdcore/CMakeLists.txt |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/include/freeDiameter/CMakeLists.txt Mon Jan 17 11:13:49 2011 +0900 +++ b/include/freeDiameter/CMakeLists.txt Mon Jan 17 11:22:35 2011 +0900 @@ -79,7 +79,6 @@ CHECK_FUNCTION_EXISTS(sctp_connectx HAVE_NATIVE_SCTP) 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 SET(CHECK_SCTP_CONNECTX_4_ARGS_SOURCE_CODE " @@ -99,14 +98,12 @@ # Require GNU TLS for building the library 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}) # Also we need libgcrypt to... display its version :( find_library(GCRYPT_LIBRARY @@ -119,6 +116,7 @@ # 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) ########################## # Create the absolute path for searching extensions
--- a/libfdcore/CMakeLists.txt Mon Jan 17 11:13:49 2011 +0900 +++ b/libfdcore/CMakeLists.txt Mon Jan 17 11:22:35 2011 +0900 @@ -48,6 +48,8 @@ SET(FDCORE_SRC ${FDCORE_SRC} PARENT_SCOPE) SET(FDCORE_GEN_SRC ${FDCORE_GEN_SRC} PARENT_SCOPE) +# Include path +INCLUDE_DIRECTORIES(${LFDCORE_INCLUDES}) # Build the executable ADD_LIBRARY(libfdcore SHARED ${FDCORE_SRC} ${FDCORE_GEN_SRC})