Fixed a crash: the singleton needs to be instantiated the first time SGCommandMgr...

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

diff --git a/simgear/props/CMakeLists.txt b/simgear/props/CMakeLists.txt
index f6f3677c424253e9236f092cd522cbc5f18fb360..3f7e9e3ccaa605cbf7432eb8395358e03b721e81 100644 (file)
--- a/simgear/props/CMakeLists.txt
+++ b/simgear/props/CMakeLists.txt
@@ -3,10 +3,13 @@ include (SimGearComponent)
 
 set(HEADERS 
     AtomicChangeListener.hxx
+    condition.hxx
+    easing_functions.hxx
     ExtendedPropertyAdapter.hxx
     PropertyBasedElement.hxx
     PropertyBasedMgr.hxx
-    condition.hxx
+    PropertyInterpolationMgr.hxx
+    PropertyInterpolator.hxx
     propertyObject.hxx
     props.hxx
     props_io.hxx
@@ -17,9 +20,12 @@ set(HEADERS
 
 set(SOURCES 
     AtomicChangeListener.cxx
+    condition.cxx
+    easing_functions.cxx
     PropertyBasedElement.cxx
     PropertyBasedMgr.cxx
-    condition.cxx
+    PropertyInterpolationMgr.cxx
+    PropertyInterpolator.cxx
     propertyObject.cxx
     props.cxx
     props_io.cxx
@@ -29,17 +35,16 @@ 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)
+add_test(props ${EXECUTABLE_OUTPUT_PATH}/test_props)
 
 add_executable(test_propertyObject propertyObject_test.cxx)
 target_link_libraries(test_propertyObject ${TEST_LIBS})
-add_test(test_propertyObject ${EXECUTABLE_OUTPUT_PATH}/test_propertyObject)
+add_test(propertyObject ${EXECUTABLE_OUTPUT_PATH}/test_propertyObject)
+
+add_executable(test_easing_functions easing_functions_test.cxx)
+target_link_libraries(test_easing_functions ${TEST_LIBS})
+add_test(easing_functions ${EXECUTABLE_OUTPUT_PATH}/test_easing_functions)
+
 endif(ENABLE_TESTS)