Fix #1783: repeated error message on console

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

diff --git a/simgear/misc/CMakeLists.txt b/simgear/misc/CMakeLists.txt
index 6b4790afa90c4ab48272ba513872da72784bc8ce..5fa8a90409954afa41aa7cfb08138edfdb137062 100644 (file)
--- a/simgear/misc/CMakeLists.txt
+++ b/simgear/misc/CMakeLists.txt
@@ -1,10 +1,11 @@
 
 include (SimGearComponent)
 
-set(HEADERS 
+set(HEADERS
     CSSBorder.hxx
     ListDiff.hxx
     ResourceManager.hxx
+    SimpleMarkdown.hxx
     SVGpreserveAspectRatio.hxx
     interpolator.hxx
     make_new.hxx
@@ -23,6 +24,7 @@ set(HEADERS
 set(SOURCES
     CSSBorder.cxx
     ResourceManager.cxx
+    SimpleMarkdown.cxx
     SVGpreserveAspectRatio.cxx
     interpolator.cxx
     sg_dir.cxx
@@ -35,6 +37,10 @@ set(SOURCES
     gzcontainerfile.cxx
     )
 
+if (WINDOWS)
+    list(APPEND HEADERS sgversionhelpers.hxx)
+endif()
+
 if (APPLE)
     list(APPEND SOURCES CocoaHelpers.mm)
 endif()
@@ -51,10 +57,6 @@ 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(strings ${EXECUTABLE_OUTPUT_PATH}/test_strings)
-target_link_libraries(test_strings ${TEST_LIBS})
-
 add_executable(test_streams sgstream_test.cxx )
 add_test(streams ${EXECUTABLE_OUTPUT_PATH}/test_streams)
 target_link_libraries(test_streams ${TEST_LIBS})
@@ -63,13 +65,24 @@ add_executable(test_path path_test.cxx )
 add_test(path ${EXECUTABLE_OUTPUT_PATH}/test_path)
 target_link_libraries(test_path ${TEST_LIBS})
 
-add_executable(test_utf8tolatin1 utf8tolatin1_test.cxx )
-add_test(utf8tolatin1 ${EXECUTABLE_OUTPUT_PATH}/test_utf8tolatin1)
-target_link_libraries(test_utf8tolatin1 ${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}
+)