canvas::Layout: support for contents margins.

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

diff --git a/simgear/structure/CMakeLists.txt b/simgear/structure/CMakeLists.txt
index 2ce3646a85d52d48ca5b76b45aa99573b9317d45..0c41b6225a1ae98da9b801adf1b5295532dcd996 100644 (file)
--- a/simgear/structure/CMakeLists.txt
+++ b/simgear/structure/CMakeLists.txt
@@ -21,11 +21,17 @@ set(HEADERS
     commands.hxx
     event_mgr.hxx
     exception.hxx
+    function_list.hxx
     intern.hxx
+    map.hxx
     subsystem_mgr.hxx
     StateMachine.hxx
     )
 
+set(DETAIL_HEADERS
+  detail/function_list_template.hxx
+)
+
 set(SOURCES
     SGAtomic.cxx
     SGBinding.cxx
@@ -42,19 +48,26 @@ set(SOURCES
     )
 
 simgear_component(structure structure "${SOURCES}" "${HEADERS}")
+simgear_component(structure/detail structure/detail "" "${DETAIL_HEADERS}")
 
 if(ENABLE_TESTS)
-    
-if (SIMGEAR_SHARED)
-    set(TEST_LIBS SimGearCore)
-else()
-    set(TEST_LIBS SimGearCore ${CMAKE_THREAD_LIBS_INIT}
-        ${ZLIB_LIBRARY}
-        ${RT_LIBRARY})
-endif()
-    
+
 add_executable(test_state_machine state_machine_test.cxx)
 target_link_libraries(test_state_machine ${TEST_LIBS})
-add_test(test_state_machine ${EXECUTABLE_OUTPUT_PATH}/test_state_machine)
+add_test(state_machine ${EXECUTABLE_OUTPUT_PATH}/test_state_machine)
+
+add_executable(test_expressions expression_test.cxx)
+target_link_libraries(test_expressions ${TEST_LIBS})
+add_test(expressions ${EXECUTABLE_OUTPUT_PATH}/test_expressions)
 
 endif(ENABLE_TESTS)
+
+add_boost_test(function_list
+  SOURCES function_list_test.cxx
+  LIBRARIES ${TEST_LIBS}
+)
+
+add_boost_test(shared_ptr
+  SOURCES shared_ptr_test.cpp
+  LIBRARIES ${TEST_LIBS}
+)