Revert "Use simgear internal stuff for the singleton class."

[simgear.git] / simgear / misc / CMakeLists.txt

diff --git a/simgear/misc/CMakeLists.txt b/simgear/misc/CMakeLists.txt
index f6c66277ea1b547f5b26177982fed0747a27a673..c4ae64df15de88952a56fb35cdd0752df8e75a89 100644 (file)
--- a/simgear/misc/CMakeLists.txt
+++ b/simgear/misc/CMakeLists.txt
@@ -2,12 +2,10 @@
 include (SimGearComponent)
 
 set(HEADERS 
-    PathOptions.hxx
     ResourceManager.hxx
     interpolator.hxx
     sg_dir.hxx
     sg_path.hxx
-    sg_sleep.hxx
     sgstream.hxx
     stdint.hxx
     stopwatch.hxx
@@ -19,12 +17,10 @@ set(HEADERS
     )
 
 set(SOURCES 
-    PathOptions.cxx
     ResourceManager.cxx
     interpolator.cxx
     sg_dir.cxx
     sg_path.cxx
-    sg_sleep.cxx
     sgstream.cxx
     strutils.cxx
     tabbed_values.cxx
@@ -33,3 +29,24 @@ set(SOURCES
     )
 
 simgear_component(misc misc "${SOURCES}" "${HEADERS}")
+
+if(ENABLE_TESTS)
+
+if (SIMGEAR_SHARED)
+    set(TEST_LIBS SimGearCore)
+else()
+    set(TEST_LIBS sgmisc sgdebug)
+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})
+
+add_executable(test_strings strutils_test.cxx )
+add_test(test_strings ${EXECUTABLE_OUTPUT_PATH}/test_strings)
+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 ${TEST_LIBS})
+endif(ENABLE_TESTS)