Navigation

Changeset 305:61f78fdbacc2 in freeDiameter


Ignore:
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

Files:
16 edited

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    r304 r305  
    2020# Location of additional CMake modules
    2121SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
     22
     23# The default directories
     24SET(DEFAULT_CONF_PATH ${CMAKE_INSTALL_PREFIX}/etc/freeDiameter CACHE PATH "Default location of freeDiameter configuration files")
     25
     26SET(INSTALL_DOCUMENTATION_PATH  ${CMAKE_INSTALL_PREFIX}/doc                     CACHE PATH "Directory where the documentation is installed.")
     27SET(INSTALL_HEADERS_PATH        ${CMAKE_INSTALL_PREFIX}/include/freeDiameter    CACHE PATH "Directory where the headers are installed.")
     28SET(INSTALL_EXTENSIONS_PATH     ${CMAKE_INSTALL_PREFIX}/lib/fdx                 CACHE PATH "Directory where the extensions are installed / searched.")
     29SET(INSTALL_DAEMON_PATH         ${CMAKE_INSTALL_PREFIX}/bin                     CACHE PATH "Directory where the daemon binary is installed.")
     30SET(INSTALL_LIBRARY_PATH        ${CMAKE_INSTALL_PREFIX}/lib                     CACHE PATH "Directory where the libfreeDiameter library is installed.")
    2231
    2332# All source code should be POSIX 200112L compatible, but some other extensions might be used, so:
    … …  
    5665
    5766INSTALL(FILES README LICENSE doc/freediameter.conf.sample
    58         DESTINATION doc
    59         COMPONENT freeDiameter-doc)
     67        DESTINATION ${INSTALL_DOCUMENTATION_PATH}
     68        COMPONENT freeDiameter-daemon)
     69

  • extensions/_sample/CMakeLists.txt

    r304 r305  
    1919
    2020INSTALL(TARGETS dbg_sample
    21         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     21        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    2222        COMPONENT freeDiameter-debug-tools)

  • extensions/acl_wl/CMakeLists.txt

    r304 r305  
    3535# We install with the daemon component because it is a base feature.
    3636INSTALL(TARGETS acl_wl
    37         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     37        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    3838        COMPONENT freeDiameter-daemon)
     39
     40INSTALL(FILES ../../doc/acl_wl.conf.sample
     41        DESTINATION ${INSTALL_DOCUMENTATION_PATH}
     42        COMPONENT freeDiameter-daemon)

  • extensions/app_acct/CMakeLists.txt

    r304 r305  
    3535
    3636INSTALL(TARGETS app_acct
    37         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     37        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    3838        COMPONENT freeDiameter-accounting-server)
    3939
     40INSTALL(FILES ../../doc/app_acct.conf.sample
     41        DESTINATION ${INSTALL_DOCUMENTATION_PATH}
     42        COMPONENT freeDiameter-accounting-server)

  • extensions/app_radgw/CMakeLists.txt

    r304 r305  
    6969  TARGET_LINK_LIBRARIES(${PLGNAME} rgw_common)
    7070  INSTALL(TARGETS ${PLGNAME}
    71         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     71        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    7272        COMPONENT freeDiameter-radius-gateway)
    7373ENDMACRO(RGWX_ADD_PLUGIN)
    … …  
    115115
    116116INSTALL(TARGETS app_radgw
    117         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     117        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    118118        COMPONENT freeDiameter-radius-gateway)
    119119
     120INSTALL(FILES ../../doc/app_radgw.conf.sample
     121        DESTINATION ${INSTALL_DOCUMENTATION_PATH}
     122        COMPONENT freeDiameter-radius-gateway)
     123
     124
    120125# Note that all compiled plugins are added by the RGWX_ADD_PLUGIN macro in the component freeDiameter-radius-gateway as well.

  • extensions/dbg_monitor/CMakeLists.txt

    r304 r305  
    88
    99INSTALL(TARGETS dbg_monitor
    10         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     10        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    1111        COMPONENT freeDiameter-debug-tools)
    1212

  • extensions/dbg_rt/CMakeLists.txt

    r304 r305  
    1010
    1111INSTALL(TARGETS dbg_rt
    12         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     12        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    1313        COMPONENT freeDiameter-debug-tools)

  • extensions/dict_eap/CMakeLists.txt

    r304 r305  
    1010
    1111INSTALL(TARGETS dict_eap
    12         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     12        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    1313        COMPONENT freeDiameter-dictionary-RFC4072)

  • extensions/dict_nasreq/CMakeLists.txt

    r304 r305  
    1010
    1111INSTALL(TARGETS dict_nasreq
    12         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     12        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    1313        COMPONENT freeDiameter-dictionary-RFC4005)

  • extensions/rt_default/CMakeLists.txt

    r304 r305  
    4949# We install with the daemon component because it is a base feature.
    5050INSTALL(TARGETS rt_default
    51         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     51        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    5252        COMPONENT freeDiameter-daemon)
    5353
     54INSTALL(FILES ../../doc/rt_default.conf.sample
     55        DESTINATION ${INSTALL_DOCUMENTATION_PATH}
     56        COMPONENT freeDiameter-daemon)
     57

  • extensions/test_acct/CMakeLists.txt

    r304 r305  
    99
    1010INSTALL(TARGETS test_acct
    11         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     11        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    1212        COMPONENT freeDiameter-debug-tools)
    1313

  • extensions/test_app/CMakeLists.txt

    r304 r305  
    2727
    2828INSTALL(TARGETS test_app
    29         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     29        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    3030        COMPONENT freeDiameter-debug-tools)
    3131
     32INSTALL(FILES ../../doc/test_app.conf.sample
     33        DESTINATION ${INSTALL_DOCUMENTATION_PATH}
     34        COMPONENT freeDiameter-debug-tools)

  • extensions/test_rt_any/CMakeLists.txt

    r304 r305  
    1010
    1111INSTALL(TARGETS test_rt_any
    12         LIBRARY DESTINATION ${DEFAULT_EXTENSIONS_PATH}
     12        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_PATH}
    1313        COMPONENT freeDiameter-debug-tools)

  • freeDiameter/CMakeLists.txt

    r304 r305  
    8383
    8484INSTALL(TARGETS freeDiameterd
    85         RUNTIME DESTINATION bin
     85        RUNTIME DESTINATION ${INSTALL_DAEMON_PATH}
    8686        COMPONENT freeDiameter-daemon)

  • include/freeDiameter/CMakeLists.txt

    r304 r305  
    66# Configurable parameters
    77
    8 # The default directory for configuration files
    9 SET(DEFAULT_CONF_PATH ${CMAKE_INSTALL_PREFIX}/etc/freeDiameter CACHE PATH "Default location of freeDiameter configuration files")
    10 
    11 # The default directory for extension files
    12 SET(DEFAULT_EXTENSIONS_PATH ${CMAKE_INSTALL_PREFIX}/lib/fdx CACHE PATH "Default location of freeDiameter extensions")
    13 
    148# Disable SCTP support completly ?
    159OPTION(DISABLE_SCTP "Disable SCTP support?" OFF)
    … …  
    1711        OPTION(DEBUG_SCTP "Verbose SCTP (for debug)?" OFF)
    1812        OPTION(SCTP_USE_MAPPED_ADDRESSES "Use v6-mapped v4 addresses in SCTP (workaround some SCTP limitations)?" OFF)
    19 ELSE (NOT DISABLE_SCTP)
    20         MESSAGE(STATUS "Disabled SCTP support.")
    2113ENDIF (NOT DISABLE_SCTP)
    2214
    … …  
    7971        SET(CMAKE_REQUIRED_LIBRARIES ${SCTP_LIBRARIES})
    8072        CHECK_C_SOURCE_COMPILES("${CHECK_SCTP_CONNECTX_4_ARGS_SOURCE_CODE}" SCTP_CONNECTX_4_ARGS)
     73ELSE (NOT DISABLE_SCTP)
     74        MESSAGE(STATUS "Disabled SCTP support.")
    8175ENDIF(NOT DISABLE_SCTP)
    8276
    … …  
    9791
    9892##########################
     93# rename this var for the file
     94SET(DEFAULT_EXTENSIONS_PATH ${INSTALL_EXTENSIONS_PATH})
     95
     96##########################
    9997
    10098# Generate the host.h file
    … …  
    103101# Save some variables for the other directories
    104102SET(FD_LIBS ${FD_LIBS} PARENT_SCOPE)
    105 SET(DEFAULT_CONF_PATH ${DEFAULT_CONF_PATH} PARENT_SCOPE)
    106 SET(DEFAULT_EXTENSIONS_PATH ${DEFAULT_EXTENSIONS_PATH} PARENT_SCOPE)
    107 
    108103
    109104####
    … …  
    112107# The headers from this directory are required to develop new extensions for freeDiameter.
    113108INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/freeDiameter-host.h libfreeDiameter.h freeDiameter.h extension.h
    114         DESTINATION include/freeDiameter
     109        DESTINATION ${INSTALL_HEADERS_PATH}
    115110        COMPONENT freeDiameter-dev)
    116111

  • libfreeDiameter/CMakeLists.txt

    r304 r305  
    3434
    3535INSTALL(TARGETS libfreeDiameter
    36         LIBRARY DESTINATION lib
     36        LIBRARY DESTINATION ${INSTALL_LIBRARY_PATH}
    3737        COMPONENT freeDiameter-common)
    3838
Note: See TracChangeset for help on using the changeset viewer.