FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A couple more tests fixes.

Browse Source
This commit is contained in:
James Turner 2013-02-07 17:48:58 +00:00
parent 9cac2c1457
commit d335ca5a8d
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
simgear/misc/CMakeLists.txt
View File

@ -32,15 +32,22 @@ set(SOURCES
simgear_component(misc misc "${SOURCES}" "${HEADERS}") simgear_component(misc misc "${SOURCES}" "${HEADERS}")
if(ENABLE_TESTS) 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_executable(test_tabbed_values tabbed_values_test.cxx)
add_test(tabbed_values ${EXECUTABLE_OUTPUT_PATH}/test_tabbed_values) 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_executable(test_strings strutils_test.cxx )
add_test(test_strings ${EXECUTABLE_OUTPUT_PATH}/test_strings) 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_executable(test_path path_test.cxx )
add_test(test_path ${EXECUTABLE_OUTPUT_PATH}/test_path) 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) endif(ENABLE_TESTS)

9
simgear/nasal/cppbind/CMakeLists.txt
View File

@ -20,7 +20,14 @@ set(SOURCES
simgear_component(nasal/cppbind nasal/cppbind "${SOURCES}" "${HEADERS}") simgear_component(nasal/cppbind nasal/cppbind "${SOURCES}" "${HEADERS}")
if(ENABLE_TESTS) 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_executable(test_cppbind cppbind_test.cxx)
add_test(test_cppbind ${EXECUTABLE_OUTPUT_PATH}/test_cppbind) 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) endif(ENABLE_TESTS)