Changeset 493:d68f27e7e814 in freeDiameter

Timestamp:

Aug 13, 2010, 5:23:39 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fixed a few CMake variable names

Files:

• cmake/Modules/FindGnuTLS.cmake (modified) (1 diff)
• cmake/Modules/FindSCTP.cmake (modified) (1 diff)
• extensions/CMakeLists.txt (modified) (1 diff)
• freeDiameter/CMakeLists.txt (modified) (1 diff)
• include/freeDiameter/CMakeLists.txt (modified) (2 diffs)

cmake/Modules/FindGnuTLS.cmake

@@ -3 +3 @@
 #
 #  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

cmake/Modules/FindSCTP.cmake

@@ -3 +3 @@
 #
 #  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

extensions/CMakeLists.txt

@@ -15 +15 @@
 # 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 )

freeDiameter/CMakeLists.txt

@@ -51 +51 @@
 # 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)

include/freeDiameter/CMakeLists.txt

@@ -80 +80 @@
         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
@@ -90 +90 @@
                 }
                 ")
-        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)