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

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:

• tests/CMakeLists.txt (moved) (moved from freeDiameter/tests/CMakeLists.txt) (5 diffs)

tests/CMakeLists.txt

@@ -1 +1 @@
 # Test directory
-PROJECT("libfreeDiameter tests" C)
+PROJECT("freeDiameter tests" C)
 
 # give the possibility to configure the timeout duration for the tests
@@ -28 +28 @@
 ADD_DEFINITIONS(-DTRACE_LEVEL=NONE)
 
-INCLUDE_DIRECTORIES( ".." )
-INCLUDE_DIRECTORIES( "../../libfreeDiameter" )
-
-BISON_FILE(../fdd.y)
-FLEX_FILE(../fdd.l)
-
-SET(TEST_COMMON_SRC "")
-
-FOREACH( SRC_FILE ${FD_COMMON_SRC})
-   SET(TEST_COMMON_SRC ${TEST_COMMON_SRC} "../${SRC_FILE}")
-ENDFOREACH(SRC_FILE)
-
-FOREACH( SRC_FILE ${FD_COMMON_GEN_SRC})
-   SET(TEST_COMMON_SRC ${TEST_COMMON_SRC} "${CMAKE_CURRENT_BINARY_DIR}/../${SRC_FILE}")
-ENDFOREACH(SRC_FILE)
-
-FOREACH( SRC_FILE ${LFD_SRC})
-   SET(TEST_COMMON_SRC ${TEST_COMMON_SRC} "../../libfreeDiameter/${SRC_FILE}")
-ENDFOREACH(SRC_FILE)
-
-# Create an archive with the daemon common files (all but main)
-ADD_LIBRARY(fDcore STATIC ${TEST_COMMON_SRC})
+INCLUDE_DIRECTORIES( "../libfdproto" )
+INCLUDE_DIRECTORIES( "../libfdcore" )
 
 
@@ -72 +52 @@
 
                 # List of source files, copied from the extension CMakeLists.
-                BISON_FILE(../../extensions/app_acct/acct_conf.y)
-                FLEX_FILE(../../extensions/app_acct/acct_conf.l)
+                BISON_FILE(../extensions/app_acct/acct_conf.y)
+                FLEX_FILE(../extensions/app_acct/acct_conf.l)
                 #SET_SOURCE_FILES_PROPERTIES(lex.acct_conf.c acct_conf.tab.c PROPERTIES COMPILE_FLAGS "-I ${CMAKE_CURRENT_SOURCE_DIR}")
                 
@@ -89 +69 @@
 
                 # The extension headers
-                INCLUDE_DIRECTORIES( "../../extensions/app_acct" )
+                INCLUDE_DIRECTORIES( "../extensions/app_acct" )
 
                 SET(testappacct_ADDITIONAL "")
 
                 FOREACH( SRC_FILE ${APP_ACCT_SRC})
-                   SET(testappacct_ADDITIONAL ${testappacct_ADDITIONAL} "../../extensions/app_acct/${SRC_FILE}")
+                   SET(testappacct_ADDITIONAL ${testappacct_ADDITIONAL} "../extensions/app_acct/${SRC_FILE}")
                 ENDFOREACH(SRC_FILE)
 
                 FOREACH( SRC_FILE ${APP_ACCT_SRC_GEN})
-                   SET(testappacct_ADDITIONAL ${testappacct_ADDITIONAL} "${CMAKE_CURRENT_BINARY_DIR}/../../extensions/app_acct/${SRC_FILE}")
+                   SET(testappacct_ADDITIONAL ${testappacct_ADDITIONAL} "${CMAKE_CURRENT_BINARY_DIR}/../extensions/app_acct/${SRC_FILE}")
                 ENDFOREACH(SRC_FILE)
 
@@ -109 +89 @@
 FOREACH( TEST ${TEST_LIST} )
    ADD_EXECUTABLE(${TEST} ${TEST}.c tests.h ${${TEST}_ADDITIONAL})
-   TARGET_LINK_LIBRARIES(${TEST} fDcore ${FD_LIBS} ${LFD_LIBS} ${${TEST}_ADDITIONAL_LIB})
+   TARGET_LINK_LIBRARIES(${TEST} libfdproto libfdcore ${${TEST}_ADDITIONAL_LIB})
    ADD_TEST(${TEST} ${EXECUTABLE_OUTPUT_PATH}/${TEST})
 ENDFOREACH( TEST )