Changeset 668:4ef3b7cdf734 in freeDiameter

Timestamp:

Jan 17, 2011, 2:08:08 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Some more cleanups in linking

Files:

• contrib/debian/control (modified) (4 diffs)
• include/freeDiameter/CMakeLists.txt (modified) (8 diffs)
• libfdcore/CMakeLists.txt (modified) (1 diff)
• libfdproto/CMakeLists.txt (modified) (1 diff)
• tests/CMakeLists.txt (modified) (1 diff)

contrib/debian/control

@@ -129 +129 @@
 Package: freediameter-radius-gateway
 Architecture: any
-Depends: ${misc:Depends}, freediameter-common (= ${binary:Version})
+Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version})
 Suggests: freediameter-dictionary-rfc4072 (= ${binary:Version}), freediameter-dictionary-rfc4740 (= ${binary:Version})
 Description: RADIUS/Diameter extensible gateway.
@@ -162 +162 @@
 Package: freediameter-accounting-server
 Architecture: any
-Depends: ${misc:Depends}, freediameter-common (= ${binary:Version}), libpq5
+Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libpq5
 Suggests: freediameter-dictionary-rfc4072
 Description: freeDiameter simple Accounting server.
@@ -182 +182 @@
 Package: freediameter-eap-server
 Architecture: any
-Depends: ${misc:Depends}, freediameter-common (= ${binary:Version}), libmysqlclient16, freediameter-dictionary-rfc4072 (= ${binary:Version})
+Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libmysqlclient16, freediameter-dictionary-rfc4072 (= ${binary:Version})
 Description: freeDiameter Diameter EAP server implementation.
  This freeDiameter extension implements a Diameter EAP server. 
@@ -197 +197 @@
 Package: freediameter-sip-server
 Architecture: any
-Depends: ${misc:Depends}, freediameter-common (= ${binary:Version}), libmysqlclient16, freediameter-dictionary-rfc4740 (= ${binary:Version})
+Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libmysqlclient16, freediameter-dictionary-rfc4740 (= ${binary:Version})
 Description: freeDiameter Diameter SIP server implementation.
  This freeDiameter extension implements a prototype 

include/freeDiameter/CMakeLists.txt

@@ -16 +16 @@
 OPTION(ERRORS_ON_TODO "(development) Generate compilation errors on TODO items ?" OFF)
 
+# Create the absolute path for searching extensions
+SET(DEFAULT_EXTENSIONS_PATH ${CMAKE_INSTALL_PREFIX}/${INSTALL_EXTENSIONS_SUFFIX})
+
+
 MARK_AS_ADVANCED(DISABLE_SCTP DEBUG_SCTP SCTP_USE_MAPPED_ADDRESSES ERRORS_ON_TODO)
 
 ########################
-# System checks 
+### System checks part
 
 INCLUDE (CheckLibraryExists)
@@ -28 +32 @@
 INCLUDE (TestBigEndian)
 
-# Check byte ordering
-TEST_BIG_ENDIAN(HOST_BIG_ENDIAN)
+
+### System checks -- mandatory support
 
 # We need the getopt_long function
@@ -37 +41 @@
 ENDIF (NOT HAVE_LONG_OPTIONS)
 
+# getifaddrs ?
+CHECK_FUNCTION_EXISTS (getifaddrs HAVE_GETIFADDRS)
+IF (NOT HAVE_GETIFADDRS)
+   MESSAGE(SEND_ERROR "The getifaddrs function is currently required by freeDiameter.")
+ENDIF (NOT HAVE_GETIFADDRS)
+
+
+### System checks -- for freeDiameter-host.h
+
+# Check byte ordering
+TEST_BIG_ENDIAN(HOST_BIG_ENDIAN)
+
 # Check if ntohll is provided on the system
 CHECK_SYMBOL_EXISTS(ntohll "" HAVE_NTOHLL)
@@ -43 +59 @@
 CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
 
-# getifaddrs ?
-CHECK_FUNCTION_EXISTS (getifaddrs HAVE_GETIFADDRS)
-IF (NOT HAVE_GETIFADDRS)
-   MESSAGE(SEND_ERROR "The getifaddrs function is currently required by freeDiameter.")
-ENDIF (NOT HAVE_GETIFADDRS)
+
+### System checks -- for includes / link
 
 # pthreads
 INCLUDE(FindThreads)
+SET(CMAKE_THREAD_LIBS_INIT ${CMAKE_THREAD_LIBS_INIT} PARENT_SCOPE)
 
 # clock_gettime
@@ -67 +81 @@
    ENDIF (HAVE_LIBRT)
 ENDIF (HAVE_CLOCK_GETTIME)
-
-# LFDPROTO_LIBS = libraries required by the libfdproto.
-SET(LFDPROTO_LIBS ${CLOCK_GETTIME_LIBS} ${CMAKE_THREAD_LIBS_INIT} PARENT_SCOPE)
-
+SET(CLOCK_GETTIME_LIBS ${CLOCK_GETTIME_LIBS} PARENT_SCOPE)
 
 # dlopen and dlclose: CMAKE_DL_LIBS
@@ -95 +106 @@
         MESSAGE(STATUS "Disabled SCTP support.")
 ENDIF(NOT DISABLE_SCTP)
+SET(SCTP_INCLUDE_DIR ${SCTP_INCLUDE_DIR} PARENT_SCOPE)
+SET(SCTP_LIBRARIES ${SCTP_LIBRARIES} PARENT_SCOPE)
 
 
 # Require GNU TLS for building the library
 FIND_PACKAGE(GnuTLS REQUIRED)
+SET(GNUTLS_INCLUDE_DIR ${GNUTLS_INCLUDE_DIR} PARENT_SCOPE)
+SET(GNUTLS_LIBRARIES ${GNUTLS_LIBRARIES} PARENT_SCOPE)
 
 find_path(GCRYPT_INCLUDE_DIR NAMES gcrypt.h)
@@ -105 +120 @@
 Endif ( NOT GCRYPT_INCLUDE_DIR )
 MARK_AS_ADVANCED(GCRYPT_INCLUDE_DIR)
+SET(GCRYPT_INCLUDE_DIR ${GCRYPT_INCLUDE_DIR} PARENT_SCOPE)
 
 # Also we need libgcrypt to... display its version :(
@@ -113 +129 @@
         MESSAGE(SEND_ERROR "Unable to find libgcrypt, please install libgcrypt or equivalent")
 Endif ( NOT GCRYPT_LIBRARY )
+SET(GCRYPT_LIBRARY ${GCRYPT_LIBRARY} PARENT_SCOPE)
 
 
-# LFDCORE_LIBS = libraries required by the libfdcore
-SET(LFDCORE_LIBS ${CMAKE_DL_LIBS} ${SCTP_LIBRARIES} ${GCRYPT_LIBRARY} ${GNUTLS_LIBRARIES} PARENT_SCOPE)
+##########################
+
+# LFDPROTO_LIBS = libraries required by the libfdproto.
+SET(LFDPROTO_LIBS ${CLOCK_GETTIME_LIBS} ${CMAKE_THREAD_LIBS_INIT} PARENT_SCOPE)
+# Dependencies: the libraries required by any code linking to libfdproto.
+SET(LFDPROTO_LINK_INTERFACES ${CMAKE_THREAD_LIBS_INIT} PARENT_SCOPE)
+
+# LFDCORE_LIBS = libraries required by the libfdcore (in addition to libfdproto and its dependencies)
+SET(LFDCORE_LIBS ${CLOCK_GETTIME_LIBS} ${CMAKE_DL_LIBS} ${SCTP_LIBRARIES} ${GCRYPT_LIBRARY} ${GNUTLS_LIBRARIES} PARENT_SCOPE)
+# And includes paths
 SET(LFDCORE_INCLUDES ${SCTP_INCLUDE_DIR} ${GNUTLS_INCLUDE_DIR} ${GCRYPT_INCLUDE_DIR} PARENT_SCOPE)
-
-##########################
-# Create the absolute path for searching extensions
-SET(DEFAULT_EXTENSIONS_PATH ${CMAKE_INSTALL_PREFIX}/${INSTALL_EXTENSIONS_SUFFIX})
+# And dependencies
+SET(LFDCORE_LINK_INTERFACES "" PARENT_SCOPE) # We don't force any other library, the programs will link with what they needs 
+                                             # (such as libgnutls if they use GNUTLS_DEBUG() macro)
 
 ##########################

libfdcore/CMakeLists.txt

@@ -59 +59 @@
         OUTPUT_NAME "fdcore"
         SOVERSION ${FD_PROJECT_VERSION_API}
-        VERSION ${FD_PROJECT_VERSION_MAJOR}.${FD_PROJECT_VERSION_MINOR}.${FD_PROJECT_VERSION_REV})
+        VERSION ${FD_PROJECT_VERSION_MAJOR}.${FD_PROJECT_VERSION_MINOR}.${FD_PROJECT_VERSION_REV}
+        LINK_INTERFACE_LIBRARIES "${LFDCORE_LINK_INTERFACES}")
 
 # The library itself needs other libraries 

libfdproto/CMakeLists.txt

@@ -26 +26 @@
         OUTPUT_NAME "fdproto"
         SOVERSION ${FD_PROJECT_VERSION_API}
-        VERSION ${FD_PROJECT_VERSION_MAJOR}.${FD_PROJECT_VERSION_MINOR}.${FD_PROJECT_VERSION_REV})
+        VERSION ${FD_PROJECT_VERSION_MAJOR}.${FD_PROJECT_VERSION_MINOR}.${FD_PROJECT_VERSION_REV}
+        LINK_INTERFACE_LIBRARIES "${LFDPROTO_LINK_INTERFACES}")
 
 # The library itself needs other libraries 

tests/CMakeLists.txt

@@ -90 +90 @@
 FOREACH( TEST ${TEST_LIST} )
    ADD_EXECUTABLE(${TEST} ${TEST}.c tests.h ${${TEST}_ADDITIONAL})
-   TARGET_LINK_LIBRARIES(${TEST} libfdproto libfdcore ${${TEST}_ADDITIONAL_LIB})
+   TARGET_LINK_LIBRARIES(${TEST} libfdproto libfdcore ${${TEST}_ADDITIONAL_LIB} ${CLOCK_GETTIME_LIBS})
    ADD_TEST(${TEST} ${EXECUTABLE_OUTPUT_PATH}/${TEST})
 ENDFOREACH( TEST )