Navigation


Changeset 658:f198d16fa7f4 in freeDiameter for libfdcore/CMakeLists.txt


Ignore:
Timestamp:
Jan 14, 2011, 3:15:23 PM (13 years ago)
Author:
Sebastien Decugis <sdecugis@nict.go.jp>
Branch:
default
Phase:
public
Message:

Initial commit for 1.1.0:

  • Restructuring:
    • libfreeDiameter:
      • renamed folder & binary into libfdproto
      • renamed libfD.h into fdproto-internal.h
      • removed signals management (replaced by triggers in libfdcore)
  • freeDiameter split into:
    • libfdcore (most contents)
      • renamed fD.h into fdcore-internal.h
      • added core.c for framework init/shutdown.
      • new triggers mechanism in events.c.
  • freeDiameterd (main, command line parsing, signals management)
  • tests:
    • now in top-level directory tests.
  • other changes:
    • fd_dict_new now returns 0 on duplicate identical entries.
    • fixes in dict_legacy_xml
    • fixes in some dictionaries
    • moved FD_DEFAULT_CONF_FILENAME definition to freeDiameter-host.h
File:
1 copied

Legend:

Unmodified
Added
Removed
  • libfdcore/CMakeLists.txt

    r592 r658  
    11# The subproject name
    2 Project("freeDiameterd" C)
     2Project("freeDiameter core library" C)
    33
    44# Configuration parser
     
    88
    99# List of source files
    10 SET(FD_COMMON_SRC
    11         fD.h
     10SET(FDCORE_SRC
     11        fdcore-internal.h
    1212        apps.c
    1313        cnxctx.h
    1414        config.c
     15        core.c
    1516        cnxctx.c
    1617        endpoints.c
     
    3536
    3637IF(NOT DISABLE_SCTP)
    37         SET(FD_COMMON_SRC ${FD_COMMON_SRC} sctp.c sctps.c)
     38        SET(FDCORE_SRC ${FDCORE_SRC} sctp.c sctps.c)
    3839ENDIF(NOT DISABLE_SCTP)
    3940
    40 SET(FD_COMMON_GEN_SRC
     41SET(FDCORE_GEN_SRC
    4142                lex.fdd.c
    4243                fdd.tab.c
     
    4546       
    4647# Save the list of files for the tests
    47 SET(FD_COMMON_SRC ${FD_COMMON_SRC} PARENT_SCOPE)
    48 SET(FD_COMMON_GEN_SRC ${FD_COMMON_GEN_SRC} PARENT_SCOPE)
    49 
    50 
    51 # Require GNU TLS for building the daemon
    52 FIND_PACKAGE(GnuTLS REQUIRED)
    53 INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_DIR})
    54 SET(FD_LIBS ${FD_LIBS} ${GNUTLS_LIBRARIES})
    55 find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)
    56 If ( NOT GCRYPT_INCLUDE_DIR )
    57         MESSAGE(SEND_ERROR "Unable to find gcrypt.h, please install libgcrypt-dev or equivalent")
    58 Endif ( NOT GCRYPT_INCLUDE_DIR )
    59 MARK_AS_ADVANCED(GCRYPT_INCLUDE_DIR)
    60 INCLUDE_DIRECTORIES(${GCRYPT_INCLUDE_DIR})
    61 
    62 # Also we need libgcrypt to... display its version :(
    63 find_library(GCRYPT_LIBRARY
    64   NAMES gcrypt
    65 )
    66 If ( NOT GCRYPT_LIBRARY )
    67         MESSAGE(SEND_ERROR "Unable to find libgcrypt, please install libgcrypt or equivalent")
    68 Endif ( NOT GCRYPT_LIBRARY )
    69 SET(FD_LIBS ${FD_LIBS} ${GCRYPT_LIBRARY})
    70 
     48SET(FDCORE_SRC ${FDCORE_SRC} PARENT_SCOPE)
     49SET(FDCORE_GEN_SRC ${FDCORE_GEN_SRC} PARENT_SCOPE)
    7150
    7251
    7352# Build the executable
    74 ADD_EXECUTABLE(freeDiameterd ${FD_COMMON_SRC} ${FD_COMMON_GEN_SRC} main.c)
     53ADD_LIBRARY(libfdcore SHARED ${FDCORE_SRC} ${FDCORE_GEN_SRC})
    7554
    76 # The version
    77 SET_TARGET_PROPERTIES(freeDiameterd PROPERTIES
     55# Avoid the liblib name, and set the version
     56SET_TARGET_PROPERTIES(libfdcore PROPERTIES
     57        OUTPUT_NAME "fdcore"
     58        SOVERSION ${FD_PROJECT_VERSION_API}
    7859        VERSION ${FD_PROJECT_VERSION_MAJOR}.${FD_PROJECT_VERSION_MINOR}.${FD_PROJECT_VERSION_REV})
    7960
    80 # The link command
    81 LINK_DIRECTORIES(${CURRENT_BINARY_DIR}/../libfreeDiameter)
    82 TARGET_LINK_LIBRARIES(freeDiameterd libfreeDiameter ${FD_LIBS})
     61# The library itself needs other libraries
     62LINK_DIRECTORIES(${CURRENT_BINARY_DIR}/../libfdproto)
     63TARGET_LINK_LIBRARIES(libfdcore libfdproto ${LFDCORE_LIBS})
    8364
    84 # The unary tests directory
    85 IF ( BUILD_TESTING )
    86         SUBDIRS(tests)
    87 ENDIF ( BUILD_TESTING )
    8865
    8966####
    9067## INSTALL section ##
    9168
    92 INSTALL(TARGETS freeDiameterd
    93         RUNTIME DESTINATION ${INSTALL_DAEMON_SUFFIX}
    94         COMPONENT freeDiameter-daemon)
     69INSTALL(TARGETS libfdcore
     70        LIBRARY DESTINATION ${INSTALL_LIBRARY_SUFFIX}
     71        COMPONENT freeDiameter-common)
Note: See TracChangeset for help on using the changeset viewer.