From d335ca5a8df14747ec2d9328175df427d5709031 Mon Sep 17 00:00:00 2001 From: James Turner Date: Thu, 7 Feb 2013 17:48:58 +0000 Subject: [PATCH] A couple more tests fixes. --- simgear/misc/CMakeLists.txt | 13 ++++++++++--- simgear/nasal/cppbind/CMakeLists.txt | 9 ++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/simgear/misc/CMakeLists.txt b/simgear/misc/CMakeLists.txt index 6743cf89..8d7852f1 100644 --- a/simgear/misc/CMakeLists.txt +++ b/simgear/misc/CMakeLists.txt @@ -32,15 +32,22 @@ set(SOURCES 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}) +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 SimGearCore) +target_link_libraries(test_tabbed_values ${TEST_LIBS}) add_executable(test_strings strutils_test.cxx ) add_test(test_strings ${EXECUTABLE_OUTPUT_PATH}/test_strings) -target_link_libraries(test_strings SimGearCore) +target_link_libraries(test_strings ${TEST_LIBS}) add_executable(test_path path_test.cxx ) add_test(test_path ${EXECUTABLE_OUTPUT_PATH}/test_path) -target_link_libraries(test_path SimGearCore) +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 62df0058..18507d8a 100644 --- a/simgear/nasal/cppbind/CMakeLists.txt +++ b/simgear/nasal/cppbind/CMakeLists.txt @@ -20,7 +20,14 @@ set(SOURCES simgear_component(nasal/cppbind nasal/cppbind "${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_cppbind cppbind_test.cxx) add_test(test_cppbind ${EXECUTABLE_OUTPUT_PATH}/test_cppbind) - target_link_libraries(test_cppbind SimGearCore) + target_link_libraries(test_cppbind ${TEST_LIBS}) endif(ENABLE_TESTS) \ No newline at end of file