CMake: Create list of libs for testing only once

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7fd4d552d112833289d5785086ad1bc0fa5f724..b592c5ccdb41fac63cd8d107534a27a612b15aa8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -360,7 +360,25 @@ if(ENABLE_TESTS)
     message(STATUS "Tests: ENABLED")
 
     include (Dart)
-        enable_testing()
+    enable_testing()
+
+    if(SIMGEAR_SHARED)
+        set( TEST_LIBS
+            SimGearCore)
+    else()
+        set( TEST_LIBS
+            SimGearCore
+            ${CMAKE_THREAD_LIBS_INIT}
+            ${ZLIB_LIBRARY}
+            ${WINSOCK_LIBRARY}
+            ${RT_LIBRARY})
+    endif()
+
+    if(NOT SIMGEAR_HEADLESS)
+        set( TEST_LIBS
+            SimGearScene
+            ${TEST_LIBS})
+    endif()
 else()
     message(STATUS "Tests: DISABLED")
 endif(ENABLE_TESTS)

diff --git a/Doxyfile b/Doxyfile
index d3577a36a04f64c3eae7630a7cf994cc4a7d01a9..edc9988ade9b898ce84040540a481905a88c342c 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -22,7 +22,7 @@ PROJECT_NAME           = SimGear
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.2.0
+PROJECT_NUMBER         = 2.11.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -56,7 +56,7 @@ EXTRACT_PRIVATE        = NO
 # If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation. 
 
-EXTRACT_STATIC         = NO
+EXTRACT_STATIC         = YES
 
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
 # undocumented members of documented classes, files or namespaces. 

diff --git a/simgear/io/CMakeLists.txt b/simgear/io/CMakeLists.txt
index 17483d63923f29fd5a770d14c4b130dab077e7b8..8170b2265bebcd2a3b23b3a494164b963df33c58 100644 (file)
--- a/simgear/io/CMakeLists.txt
+++ b/simgear/io/CMakeLists.txt
@@ -38,16 +38,6 @@ simgear_component(io io "${SOURCES}" "${HEADERS}")
 
 if(ENABLE_TESTS)
 
-if (SIMGEAR_SHARED)
-    set(TEST_LIBS SimGearCore)
-else()
-    set(TEST_LIBS SimGearCore
-            ${CMAKE_THREAD_LIBS_INIT}
-            ${WINSOCK_LIBRARY}
-            ${ZLIB_LIBRARY}
-            ${RT_LIBRARY})
-endif()
-
 add_executable(test_sock socktest.cxx)
 target_link_libraries(test_sock ${TEST_LIBS})
 
@@ -66,4 +56,5 @@ add_executable(test_binobj test_binobj.cxx)
 target_link_libraries(test_binobj ${TEST_LIBS}) 
     
 add_test(binobj ${EXECUTABLE_OUTPUT_PATH}/test_binobj)
+
 endif(ENABLE_TESTS)

diff --git a/simgear/math/CMakeLists.txt b/simgear/math/CMakeLists.txt
index 436b8f41e38368fc45a2561a7ac8ada6238ff4e3..71a61cead25703b49866fbeb99b6dcadff4e1a2a 100644 (file)
--- a/simgear/math/CMakeLists.txt
+++ b/simgear/math/CMakeLists.txt
@@ -45,12 +45,6 @@ simgear_component(math math "${SOURCES}" "${HEADERS}")
 
 if(ENABLE_TESTS)
 
-if (SIMGEAR_SHARED)
-    set(TEST_LIBS SimGearCore)
-else()
-    set(TEST_LIBS SimGearCore ${CMAKE_THREAD_LIBS_INIT})
-endif()
-
 add_executable(math_test SGMathTest.cxx)
 target_link_libraries(math_test ${TEST_LIBS})
 add_test(math ${EXECUTABLE_OUTPUT_PATH}/math_test)
@@ -58,4 +52,5 @@ add_test(math ${EXECUTABLE_OUTPUT_PATH}/math_test)
 add_executable(geometry_test SGGeometryTest.cxx)
 target_link_libraries(geometry_test ${TEST_LIBS})
 add_test(geometry ${EXECUTABLE_OUTPUT_PATH}/geometry_test)
+
 endif(ENABLE_TESTS)

diff --git a/simgear/misc/CMakeLists.txt b/simgear/misc/CMakeLists.txt
index c2fbf60a83d4dda41467782064a1a410cb384a86..a58330f03324b571bb454e1ca8e92f5b7dedfea6 100644 (file)
--- a/simgear/misc/CMakeLists.txt
+++ b/simgear/misc/CMakeLists.txt
@@ -33,14 +33,6 @@ simgear_component(misc misc "${SOURCES}" "${HEADERS}")
 
 if(ENABLE_TESTS)
 
-if (SIMGEAR_SHARED)
-    set(TEST_LIBS SimGearCore)
-else()
-    set(TEST_LIBS SimGearCore
-            ${CMAKE_THREAD_LIBS_INIT}
-            ${ZLIB_LIBRARY})
-endif()
-
 add_executable(test_tabbed_values tabbed_values_test.cxx)
 add_test(tabbed_values ${EXECUTABLE_OUTPUT_PATH}/test_tabbed_values)
 target_link_libraries(test_tabbed_values ${TEST_LIBS})
@@ -56,4 +48,5 @@ target_link_libraries(test_streams ${TEST_LIBS})
 add_executable(test_path path_test.cxx )
 add_test(test_path ${EXECUTABLE_OUTPUT_PATH}/test_path)
 target_link_libraries(test_path ${TEST_LIBS})
+
 endif(ENABLE_TESTS)

diff --git a/simgear/nasal/cppbind/CMakeLists.txt b/simgear/nasal/cppbind/CMakeLists.txt
index 32a089046651483fe9d346a8be774f47252438d8..ac9e7e0886a0af838e447a0d6c20f2f8896dc307 100644 (file)
--- a/simgear/nasal/cppbind/CMakeLists.txt
+++ b/simgear/nasal/cppbind/CMakeLists.txt
@@ -27,13 +27,6 @@ simgear_component(nasal/cppbind nasal/cppbind "${SOURCES}" "${HEADERS}")
 simgear_component(nasal/cppbind/detail nasal/cppbind/detail "" "${DETAIL_HEADERS}")
 
 if(ENABLE_TESTS)
-
-if (SIMGEAR_SHARED)
-    set(TEST_LIBS SimGearCore)
-else()
-    set(TEST_LIBS SimGearCore ${CMAKE_THREAD_LIBS_INIT})
-endif()
-
   add_executable(test_cppbind cppbind_test.cxx)
   add_test(test_cppbind ${EXECUTABLE_OUTPUT_PATH}/test_cppbind)
   target_link_libraries(test_cppbind ${TEST_LIBS})

diff --git a/simgear/props/CMakeLists.txt b/simgear/props/CMakeLists.txt
index f6f3677c424253e9236f092cd522cbc5f18fb360..c770f78feaca7e5708f9a6dabd85134948d13366 100644 (file)
--- a/simgear/props/CMakeLists.txt
+++ b/simgear/props/CMakeLists.txt
@@ -29,12 +29,6 @@ simgear_component(props props "${SOURCES}" "${HEADERS}")
 
 if(ENABLE_TESTS)
 
-if (SIMGEAR_SHARED)
-    set(TEST_LIBS SimGearCore)
-else()
-    set(TEST_LIBS SimGearCore ${CMAKE_THREAD_LIBS_INIT})
-endif()
-
 add_executable(test_props props_test.cxx)
 target_link_libraries(test_props ${TEST_LIBS})
 add_test(test_props ${EXECUTABLE_OUTPUT_PATH}/test_props)

diff --git a/simgear/props/props_test.cxx b/simgear/props/props_test.cxx
index 5578357415879df43aa7e609cd7eae4c0246c6fe..debf79d78debb7a09ce1797ee32a726d5a058370 100644 (file)
--- a/simgear/props/props_test.cxx
+++ b/simgear/props/props_test.cxx
@@ -19,7 +19,7 @@ using std::cerr;
 using std::endl;
 
 
-\f
+
 ////////////////////////////////////////////////////////////////////////
 // Sample object.
 ////////////////////////////////////////////////////////////////////////
@@ -38,7 +38,7 @@ private:
 };
 
 
-\f
+
 ////////////////////////////////////////////////////////////////////////
 // Sample function.
 ////////////////////////////////////////////////////////////////////////
@@ -48,7 +48,7 @@ static int get100 () { return 100; }
 static double getNum (int index) { return 1.0 / index; }
 
 
-\f
+
 ////////////////////////////////////////////////////////////////////////
 // Show a value.
 ////////////////////////////////////////////////////////////////////////
@@ -64,7 +64,7 @@ show_values (const SGPropertyNode * node)
 }
 
 
-\f
+
 ////////////////////////////////////////////////////////////////////////
 // Test individual values.
 ////////////////////////////////////////////////////////////////////////
@@ -270,7 +270,7 @@ test_value ()
 }
 
 
-\f
+
 ////////////////////////////////////////////////////////////////////////
 // Check property nodes.
 ////////////////////////////////////////////////////////////////////////

diff --git a/simgear/scene/tgdb/CMakeLists.txt b/simgear/scene/tgdb/CMakeLists.txt
index e514859cd424adc93348a764b9a1f380771bed50..cdf6a3dec155450db7e75203e8bd642db878a395 100644 (file)
--- a/simgear/scene/tgdb/CMakeLists.txt
+++ b/simgear/scene/tgdb/CMakeLists.txt
@@ -41,11 +41,6 @@ set(SOURCES
 simgear_scene_component(tgdb scene/tgdb "${SOURCES}" "${HEADERS}")
 
 if(ENABLE_TESTS)
-    if (SIMGEAR_SHARED)
-        set(TEST_LIBS SimGearCore)
-    else()
-        set(TEST_LIBS SimGearCore ${CMAKE_THREAD_LIBS_INIT})
-    endif()
 
   add_executable(BucketBoxTest BucketBoxTest.cxx)
   target_link_libraries(BucketBoxTest ${TEST_LIBS})

diff --git a/simgear/scene/util/CMakeLists.txt b/simgear/scene/util/CMakeLists.txt
index d10a42045b70d9c6de0a5de3dd8c43e0739679ab..02d7766db96ce015d5d6f349b15be034130cec7a 100644 (file)
--- a/simgear/scene/util/CMakeLists.txt
+++ b/simgear/scene/util/CMakeLists.txt
@@ -53,7 +53,9 @@ set(SOURCES
 simgear_scene_component(util scene/util "${SOURCES}" "${HEADERS}")
 
 if(ENABLE_TESTS)
+
 add_executable(test_parse_color parse_color_test.cxx )
 add_test(test_parse_color ${EXECUTABLE_OUTPUT_PATH}/test_parse_color)
-target_link_libraries(test_parse_color SimGearScene)
+target_link_libraries(test_parse_color ${TEST_LIBS})
+
 endif(ENABLE_TESTS)

diff --git a/simgear/sound/CMakeLists.txt b/simgear/sound/CMakeLists.txt
index cbedeed6b38f077b0e122a03bf87ab67e73e57fc..a15c9110d1702e189ac1ee4ea8de7501e6012694 100644 (file)
--- a/simgear/sound/CMakeLists.txt
+++ b/simgear/sound/CMakeLists.txt
@@ -24,14 +24,12 @@ simgear_scene_component(sound sound "${SOURCES}" "${HEADERS}")
 if(ENABLE_TESTS AND ENABLE_SOUND)
 
 if (SIMGEAR_SHARED)
-    set(SOUND_TEST_LIBS SimGearScene)
+    set( SOUND_TEST_LIBS
+        ${TEST_LIBS})
 else()
     set(SOUND_TEST_LIBS
-        SimGearScene SimGearCore
-        ${CMAKE_THREAD_LIBS_INIT}
-        ${RT_LIBRARY}
-        ${OPENAL_LIBRARY}
-        ${ZLIB_LIBRARY})
+        ${TEST_LIBS}
+        ${OPENAL_LIBRARY})
 endif()
 
 function(create_test TEST_NAME)

diff --git a/simgear/structure/CMakeLists.txt b/simgear/structure/CMakeLists.txt
index f7e29a7645f78ce4e98af785548fb23e5baeb456..0cc3f79d8867cefc0be122825b8b464e99999cb0 100644 (file)
--- a/simgear/structure/CMakeLists.txt
+++ b/simgear/structure/CMakeLists.txt
@@ -44,15 +44,7 @@ set(SOURCES
 simgear_component(structure structure "${SOURCES}" "${HEADERS}")
 
 if(ENABLE_TESTS)
-    
-if (SIMGEAR_SHARED)
-    set(TEST_LIBS SimGearCore)
-else()
-    set(TEST_LIBS SimGearCore ${CMAKE_THREAD_LIBS_INIT}
-        ${ZLIB_LIBRARY}
-        ${RT_LIBRARY})
-endif()
-    
+
 add_executable(test_state_machine state_machine_test.cxx)
 target_link_libraries(test_state_machine ${TEST_LIBS})
 add_test(test_state_machine ${EXECUTABLE_OUTPUT_PATH}/test_state_machine)
@@ -61,5 +53,4 @@ add_executable(test_expressions expression_test.cxx)
 target_link_libraries(test_expressions ${TEST_LIBS})
 add_test(test_expressions ${EXECUTABLE_OUTPUT_PATH}/test_expressions)
 
-
 endif(ENABLE_TESTS)