Mercurial > hg > freeDiameter
changeset 493:d68f27e7e814
Fixed a few CMake variable names
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Fri, 13 Aug 2010 17:23:39 +0900 |
| parents | 121397bd1afc |
| children | 6e53be78d658 |
| files | cmake/Modules/FindGnuTLS.cmake cmake/Modules/FindSCTP.cmake extensions/CMakeLists.txt freeDiameter/CMakeLists.txt include/freeDiameter/CMakeLists.txt |
| diffstat | 5 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/cmake/Modules/FindGnuTLS.cmake Fri Aug 13 17:06:28 2010 +0900 +++ b/cmake/Modules/FindGnuTLS.cmake Fri Aug 13 17:23:39 2010 +0900 @@ -2,12 +2,12 @@ # Find the native GNUTLS includes and library # # GNUTLS_FOUND - True if gnutls found. -# GNUTLS_INCLUDE_DIRS - where to find gnutls.h, etc. +# GNUTLS_INCLUDE_DIR - where to find gnutls.h, etc. # GNUTLS_LIBRARIES - List of libraries when using gnutls. -if (GNUTLS_INCLUDE_DIRS AND GNUTLS_LIBRARIES) +if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARIES) set(GNUTLS_FIND_QUIETLY TRUE) -endif (GNUTLS_INCLUDE_DIRS AND GNUTLS_LIBRARIES) +endif (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARIES) # Include dir find_path(GNUTLS_INCLUDE_DIR
--- a/cmake/Modules/FindSCTP.cmake Fri Aug 13 17:06:28 2010 +0900 +++ b/cmake/Modules/FindSCTP.cmake Fri Aug 13 17:23:39 2010 +0900 @@ -2,12 +2,12 @@ # Once done, this will define # # SCTP_FOUND - system has SCTP -# SCTP_INCLUDE_DIRS - the SCTP include directories +# SCTP_INCLUDE_DIR - the SCTP include directories # SCTP_LIBRARIES - link these to use SCTP -if (SCTP_INCLUDE_DIRS AND SCTP_LIBRARIES) +if (SCTP_INCLUDE_DIR AND SCTP_LIBRARIES) set(SCTP_FIND_QUIETLY TRUE) -endif (SCTP_INCLUDE_DIRS AND SCTP_LIBRARIES) +endif (SCTP_INCLUDE_DIR AND SCTP_LIBRARIES) # Include dir find_path(SCTP_INCLUDE_DIR
--- a/extensions/CMakeLists.txt Fri Aug 13 17:06:28 2010 +0900 +++ b/extensions/CMakeLists.txt Fri Aug 13 17:23:39 2010 +0900 @@ -14,7 +14,7 @@ # The extensions include the headers of freeDiameter that contains gnutls objects FIND_PACKAGE(GnuTLS REQUIRED) -INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIRS}) +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")
--- a/freeDiameter/CMakeLists.txt Fri Aug 13 17:06:28 2010 +0900 +++ b/freeDiameter/CMakeLists.txt Fri Aug 13 17:23:39 2010 +0900 @@ -50,7 +50,7 @@ # Require GNU TLS for building the daemon FIND_PACKAGE(GnuTLS REQUIRED) -INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIRS}) +INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIR}) SET(FD_LIBS ${FD_LIBS} ${GNUTLS_LIBRARIES}) find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h) If ( NOT GCRYPT_INCLUDE_DIR )
--- a/include/freeDiameter/CMakeLists.txt Fri Aug 13 17:06:28 2010 +0900 +++ b/include/freeDiameter/CMakeLists.txt Fri Aug 13 17:23:39 2010 +0900 @@ -79,7 +79,7 @@ CHECK_FUNCTION_EXISTS(sctp_connectx HAVE_NATIVE_SCTP) IF(NOT HAVE_NATIVE_SCTP) FIND_PACKAGE(SCTP REQUIRED) - INCLUDE_DIRECTORIES(${SCTP_INCLUDE_DIRS}) + 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 " @@ -89,7 +89,7 @@ return sctp_connectx(0, NULL, 0, NULL); } ") - SET(CMAKE_REQUIRED_INCLUDES ${SCTP_INCLUDE_DIRS}) + SET(CMAKE_REQUIRED_INCLUDES ${SCTP_INCLUDE_DIR}) SET(CMAKE_REQUIRED_LIBRARIES ${SCTP_LIBRARIES}) CHECK_C_SOURCE_COMPILES("${CHECK_SCTP_CONNECTX_4_ARGS_SOURCE_CODE}" SCTP_CONNECTX_4_ARGS) ELSE (NOT DISABLE_SCTP)