Fix some places relying on public 'using std::string' in SimGear

[flightgear.git] / src / Main / CMakeLists.txt

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 6a4df8c8960e4589b3b3d44c46c780f84eb79fed..2a541e30498428c3df8a7d13e03189e22f4fe0fe 100644 (file)
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -8,52 +8,40 @@ if (MSVC)
 endif (MSVC)
 
 set(SOURCES
-       CameraGroup.cxx
-       FGEventHandler.cxx
-       WindowBuilder.cxx
-       WindowSystemAdapter.cxx
        bootstrap.cxx
        fg_commands.cxx
        fg_init.cxx
        fg_io.cxx
        fg_os_common.cxx
-       fg_os_osgviewer.cxx
        fg_props.cxx
-       fgviewer.cxx
        globals.cxx
+       locale.cxx
        logger.cxx
        main.cxx
        options.cxx
-       renderer.cxx
-       splash.cxx
        util.cxx
-       viewer.cxx
-       viewmgr.cxx
        ${RESOURCE_FILE}
        )
 
 set(HEADERS
-       CameraGroup.hxx
-       FGEventHandler.hxx
-       WindowBuilder.hxx
-       WindowSystemAdapter.hxx
        fg_commands.hxx
        fg_init.hxx
        fg_io.hxx
        fg_props.hxx
-       fgviewer.hxx
        globals.hxx
+       locale.hxx
        logger.hxx
        main.hxx
        options.hxx
-       renderer.hxx
-       splash.hxx
        util.hxx
-       viewer.hxx
-       viewmgr.hxx
        )
 
-add_executable(fgfs ${SOURCES} ${HEADERS})
+get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)
+get_property(FG_HEADERS GLOBAL PROPERTY FG_HEADERS)
+
+link_directories ( ${Boost_LIBRARY_DIRS} )
+
+add_executable(fgfs ${SOURCES} ${FG_SOURCES} ${FG_HEADERS} ${HEADERS})
 
 get_property(FG_LIBS GLOBAL PROPERTY FG_LIBS)
 #message(STATUS "fg libs ${FG_LIBS}")
@@ -69,8 +57,17 @@ else()
        set(HLA_LIBRARIES "")
 endif()
 
+if(ENABLE_JSBSIM)
+    # FIXME - remove once JSBSim doesn't expose private headers
+    include_directories(${PROJECT_SOURCE_DIR}/src/FDM/JSBSim)
+    
+    target_link_libraries(fgfs JSBSim)
+endif()
+
+include_directories(${PROJECT_SOURCE_DIR}/src/Canvas/ShivaVG/include)
+add_definitions(-DVG_API_EXPORT)
+
 target_link_libraries(fgfs
-       ${FG_LIBS}
        ${SIMGEAR_LIBRARIES}
        ${OPENSCENEGRAPH_LIBRARIES}
        ${OPENGL_LIBRARIES}
@@ -81,11 +78,13 @@ target_link_libraries(fgfs
        ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
        ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
        ${PLATFORM_LIBS}
+       ShivaVG
 )
 
 install(TARGETS fgfs RUNTIME DESTINATION bin)
 
 add_executable(metar metar_main.cxx)
+
 target_link_libraries(metar
        ${SIMGEAR_LIBRARIES}
        ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
@@ -94,4 +93,3 @@ target_link_libraries(metar
 )
 
 install(TARGETS metar RUNTIME DESTINATION bin)
-