Fix VS2010 lack of fminf

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

diff --git a/simgear/misc/CMakeLists.txt b/simgear/misc/CMakeLists.txt
index 7a06f3bd465fc4d31df72aba07141f6ddd03e610..3cf1e96a44bb87a94e49e6a4e8e6b95ada7c5f96 100644 (file)
--- a/simgear/misc/CMakeLists.txt
+++ b/simgear/misc/CMakeLists.txt
@@ -2,12 +2,15 @@
 include (SimGearComponent)
 
 set(HEADERS 
-    PathOptions.hxx
+    CSSBorder.hxx
+    ListDiff.hxx
     ResourceManager.hxx
+    SimpleMarkdown.hxx
+    SVGpreserveAspectRatio.hxx
     interpolator.hxx
+    make_new.hxx
     sg_dir.hxx
     sg_path.hxx
-    sg_sleep.hxx
     sgstream.hxx
     stdint.hxx
     stopwatch.hxx
@@ -15,34 +18,67 @@ set(HEADERS
     tabbed_values.hxx
     texcoord.hxx
     zfstream.hxx
-    
+    gzcontainerfile.hxx
     )
 
-set(SOURCES 
-    PathOptions.cxx
+set(SOURCES
+    CSSBorder.cxx
     ResourceManager.cxx
+    SimpleMarkdown.cxx
+    SVGpreserveAspectRatio.cxx
     interpolator.cxx
     sg_dir.cxx
     sg_path.cxx
-    sg_sleep.cxx
     sgstream.cxx
     strutils.cxx
     tabbed_values.cxx
     texcoord.cxx
     zfstream.cxx
+    gzcontainerfile.cxx
     )
 
+if (APPLE)
+    list(APPEND SOURCES CocoaHelpers.mm)
+endif()
+
 simgear_component(misc misc "${SOURCES}" "${HEADERS}")
 
+if(ENABLE_TESTS)
+
+add_executable(test_CSSBorder CSSBorder_test.cxx)
+add_test(CSSBorder ${EXECUTABLE_OUTPUT_PATH}/test_CSSBorder)
+target_link_libraries(test_CSSBorder ${TEST_LIBS})
+
 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 sgmisc)
+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 sgmisc)
+add_executable(test_streams sgstream_test.cxx )
+add_test(streams ${EXECUTABLE_OUTPUT_PATH}/test_streams)
+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 sgmisc sgdebug)
+add_test(path ${EXECUTABLE_OUTPUT_PATH}/test_path)
+target_link_libraries(test_path ${TEST_LIBS})
+
+endif(ENABLE_TESTS)
+
+add_boost_test(SimpleMarkdown
+  SOURCES SimpleMarkdown_test.cxx
+  LIBRARIES ${TEST_LIBS}
+)
+
+add_boost_test(SVGpreserveAspectRatio
+  SOURCES SVGpreserveAspectRatio_test.cxx
+  LIBRARIES ${TEST_LIBS}
+)
+
+add_boost_test(strutils
+  SOURCES strutils_test.cxx
+  LIBRARIES ${TEST_LIBS}
+)
 
+add_boost_test(utf8tolatin1
+  SOURCES utf8tolatin1_test.cxx
+  LIBRARIES ${TEST_LIBS}
+)