Mercurial > hg > freeDiameter
changeset 305:61f78fdbacc2
Cleanup vars names
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Fri, 14 May 2010 18:05:43 +0900 |
| parents | ad3c46016584 |
| children | 2c9399b59e6b |
| files | CMakeLists.txt extensions/_sample/CMakeLists.txt extensions/acl_wl/CMakeLists.txt extensions/app_acct/CMakeLists.txt extensions/app_radgw/CMakeLists.txt extensions/dbg_monitor/CMakeLists.txt extensions/dbg_rt/CMakeLists.txt extensions/dict_eap/CMakeLists.txt extensions/dict_nasreq/CMakeLists.txt extensions/rt_default/CMakeLists.txt extensions/test_acct/CMakeLists.txt extensions/test_app/CMakeLists.txt extensions/test_rt_any/CMakeLists.txt freeDiameter/CMakeLists.txt include/freeDiameter/CMakeLists.txt libfreeDiameter/CMakeLists.txt |
| diffstat | 16 files changed, 53 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -20,6 +20,15 @@ # Location of additional CMake modules SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") +# The default directories +SET(DEFAULT_CONF_PATH ${CMAKE_INSTALL_PREFIX}/etc/freeDiameter CACHE PATH "Default location of freeDiameter configuration files") + +SET(INSTALL_DOCUMENTATION_PATH ${CMAKE_INSTALL_PREFIX}/doc CACHE PATH "Directory where the documentation is installed.") +SET(INSTALL_HEADERS_PATH ${CMAKE_INSTALL_PREFIX}/include/freeDiameter CACHE PATH "Directory where the headers are installed.") +SET(INSTALL_EXTENSIONS_PATH ${CMAKE_INSTALL_PREFIX}/lib/fdx CACHE PATH "Directory where the extensions are installed / searched.") +SET(INSTALL_DAEMON_PATH ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Directory where the daemon binary is installed.") +SET(INSTALL_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib CACHE PATH "Directory where the libfreeDiameter library is installed.") + # All source code should be POSIX 200112L compatible, but some other extensions might be used, so: ADD_DEFINITIONS(-D_GNU_SOURCE) IF (CMAKE_BUILD_TYPE MATCHES "Debug") @@ -55,5 +64,6 @@ ## INSTALL section ## INSTALL(FILES README LICENSE doc/freediameter.conf.sample - DESTINATION doc - COMPONENT freeDiameter-doc) + DESTINATION ${INSTALL_DOCUMENTATION_PATH} + COMPONENT freeDiameter-daemon) +
--- a/extensions/_sample/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/_sample/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -18,5 +18,5 @@ ## INSTALL section ## INSTALL(TARGETS dbg_sample - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-debug-tools)
--- a/extensions/acl_wl/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/acl_wl/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -34,5 +34,9 @@ # We install with the daemon component because it is a base feature. INSTALL(TARGETS acl_wl - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-daemon) + +INSTALL(FILES ../../doc/acl_wl.conf.sample + DESTINATION ${INSTALL_DOCUMENTATION_PATH} + COMPONENT freeDiameter-daemon)
--- a/extensions/app_acct/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/app_acct/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -34,6 +34,9 @@ ## INSTALL section ## INSTALL(TARGETS app_acct - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-accounting-server) +INSTALL(FILES ../../doc/app_acct.conf.sample + DESTINATION ${INSTALL_DOCUMENTATION_PATH} + COMPONENT freeDiameter-accounting-server)
--- a/extensions/app_radgw/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/app_radgw/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -68,7 +68,7 @@ SET_TARGET_PROPERTIES(${PLGNAME} PROPERTIES SUFFIX ".rgwx" ) TARGET_LINK_LIBRARIES(${PLGNAME} rgw_common) INSTALL(TARGETS ${PLGNAME} - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-radius-gateway) ENDMACRO(RGWX_ADD_PLUGIN) @@ -114,7 +114,12 @@ ## INSTALL section ## INSTALL(TARGETS app_radgw - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-radius-gateway) +INSTALL(FILES ../../doc/app_radgw.conf.sample + DESTINATION ${INSTALL_DOCUMENTATION_PATH} + COMPONENT freeDiameter-radius-gateway) + + # Note that all compiled plugins are added by the RGWX_ADD_PLUGIN macro in the component freeDiameter-radius-gateway as well.
--- a/extensions/dbg_monitor/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/dbg_monitor/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -7,6 +7,6 @@ ## INSTALL section ## INSTALL(TARGETS dbg_monitor - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-debug-tools)
--- a/extensions/dbg_rt/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/dbg_rt/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -9,5 +9,5 @@ ## INSTALL section ## INSTALL(TARGETS dbg_rt - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-debug-tools)
--- a/extensions/dict_eap/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/dict_eap/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -9,5 +9,5 @@ ## INSTALL section ## INSTALL(TARGETS dict_eap - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-dictionary-RFC4072)
--- a/extensions/dict_nasreq/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/dict_nasreq/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -9,5 +9,5 @@ ## INSTALL section ## INSTALL(TARGETS dict_nasreq - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-dictionary-RFC4005)
--- a/extensions/rt_default/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/rt_default/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -48,6 +48,10 @@ # We install with the daemon component because it is a base feature. INSTALL(TARGETS rt_default - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-daemon) +INSTALL(FILES ../../doc/rt_default.conf.sample + DESTINATION ${INSTALL_DOCUMENTATION_PATH} + COMPONENT freeDiameter-daemon) +
--- a/extensions/test_acct/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/test_acct/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -8,6 +8,6 @@ ## INSTALL section ## INSTALL(TARGETS test_acct - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-debug-tools)
--- a/extensions/test_app/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/test_app/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -26,6 +26,9 @@ ## INSTALL section ## INSTALL(TARGETS test_app - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-debug-tools) +INSTALL(FILES ../../doc/test_app.conf.sample + DESTINATION ${INSTALL_DOCUMENTATION_PATH} + COMPONENT freeDiameter-debug-tools)
--- a/extensions/test_rt_any/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/extensions/test_rt_any/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -9,5 +9,5 @@ ## INSTALL section ## INSTALL(TARGETS test_rt_any - LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH} + LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH} COMPONENT freeDiameter-debug-tools)
--- a/freeDiameter/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/freeDiameter/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -82,5 +82,5 @@ ## INSTALL section ## INSTALL(TARGETS freeDiameterd - RUNTIME DESTINATION bin + RUNTIME DESTINATION ${INSTALL_DAEMON_PATH} COMPONENT freeDiameter-daemon)
--- a/include/freeDiameter/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/include/freeDiameter/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -5,19 +5,11 @@ ######################## # 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) IF (NOT DISABLE_SCTP) 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) # Find TODO items in the code easily ? @@ -78,6 +70,8 @@ ") 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) # Check byte ordering @@ -96,21 +90,22 @@ CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H) ########################## +# rename this var for the file +SET(DEFAULT_EXTENSIONS_PATH ${INSTALL_EXTENSIONS_PATH}) + +########################## # Generate the host.h file CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/freeDiameter-host.h.in ${CMAKE_CURRENT_BINARY_DIR}/freeDiameter-host.h) # 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) - #### ## INSTALL section ## # 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)
--- a/libfreeDiameter/CMakeLists.txt Fri May 14 17:26:53 2010 +0900 +++ b/libfreeDiameter/CMakeLists.txt Fri May 14 18:05:43 2010 +0900 @@ -33,6 +33,6 @@ ## INSTALL section ## INSTALL(TARGETS libfreeDiameter - LIBRARY DESTINATION lib + LIBRARY DESTINATION ${INSTALL_LIBRARY_PATH} COMPONENT freeDiameter-common)