Changeset 305:61f78fdbacc2 in freeDiameter for include/freeDiameter/CMakeLists.txt

Timestamp:

May 14, 2010, 6:05:43 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Cleanup vars names

File:

• include/freeDiameter/CMakeLists.txt (modified) (6 diffs)

include/freeDiameter/CMakeLists.txt

@@ -6 +6 @@
 # Configurable parameters
 
-# The default directory for configuration files
-SET(DEFAULT_CONF_PATH ${CMAKE_INSTALL_PREFIX}/etc/freeDiameter CACHE PATH "Default location of freeDiameter configuration files")
-
-# The default directory for extension files
-SET(DEFAULT_EXTENSIONS_PATH ${CMAKE_INSTALL_PREFIX}/lib/fdx CACHE PATH "Default location of freeDiameter extensions")
-
 # Disable SCTP support completly ?
 OPTION(DISABLE_SCTP "Disable SCTP support?" OFF)
@@ -17 +11 @@
         OPTION(DEBUG_SCTP "Verbose SCTP (for debug)?" OFF)
         OPTION(SCTP_USE_MAPPED_ADDRESSES "Use v6-mapped v4 addresses in SCTP (workaround some SCTP limitations)?" OFF)
-ELSE (NOT DISABLE_SCTP)
-        MESSAGE(STATUS "Disabled SCTP support.")
 ENDIF (NOT DISABLE_SCTP)
 
@@ -79 +71 @@
         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)
+        MESSAGE(STATUS "Disabled SCTP support.")
 ENDIF(NOT DISABLE_SCTP)
 
@@ -97 +91 @@
 
 ##########################
+# rename this var for the file
+SET(DEFAULT_EXTENSIONS_PATH ${INSTALL_EXTENSIONS_PATH})
+
+##########################
 
 # Generate the host.h file
@@ -103 +101 @@
 # Save some variables for the other directories
 SET(FD_LIBS ${FD_LIBS} PARENT_SCOPE)
-SET(DEFAULT_CONF_PATH ${DEFAULT_CONF_PATH} PARENT_SCOPE)
-SET(DEFAULT_EXTENSIONS_PATH ${DEFAULT_EXTENSIONS_PATH} PARENT_SCOPE)
-
 
 ####
@@ -112 +107 @@
 # The headers from this directory are required to develop new extensions for freeDiameter.
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/freeDiameter-host.h libfreeDiameter.h freeDiameter.h extension.h
-        DESTINATION include/freeDiameter
+        DESTINATION ${INSTALL_HEADERS_PATH}
         COMPONENT freeDiameter-dev)