ATIS upgrade

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

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 2a541e30498428c3df8a7d13e03189e22f4fe0fe..507c7beb578915ea5c8b27504eddafa617b97d42 100644 (file)
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -20,6 +20,8 @@ set(SOURCES
        main.cxx
        options.cxx
        util.cxx
+    positioninit.cxx
+    subsystemFactory.cxx
        ${RESOURCE_FILE}
        )
 
@@ -34,6 +36,8 @@ set(HEADERS
        main.hxx
        options.hxx
        util.hxx
+    positioninit.hxx
+    subsystemFactory.hxx
        )
 
 get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)
@@ -41,17 +45,39 @@ get_property(FG_HEADERS GLOBAL PROPERTY FG_HEADERS)
 
 link_directories ( ${Boost_LIBRARY_DIRS} )
 
+get_property(FG_GROUPS_C GLOBAL PROPERTY FG_GROUPS_C)
+string(REPLACE "@" ";" groups ${FG_GROUPS_C} )
+foreach(g ${groups})
+       string(REPLACE "#" ";" g2 ${g})
+       list(GET g2 0 name)
+       list(REMOVE_AT g2 0)
+       source_group("${name}\\Sources" FILES ${g2})
+endforeach()
+
+get_property(FG_GROUPS_H GLOBAL PROPERTY FG_GROUPS_H)
+string(REPLACE "@" ";" groups ${FG_GROUPS_H} )
+foreach(g ${groups})
+       string(REPLACE "#" ";" g2 ${g})
+       list(GET g2 0 name)
+       list(REMOVE_AT g2 0)
+       source_group("${name}\\Headers" FILES ${g2})
+endforeach()
+
+source_group("Main\\Headers" FILES ${HEADERS})
+source_group("Main\\Sources" FILES ${SOURCES})
 add_executable(fgfs ${SOURCES} ${FG_SOURCES} ${FG_HEADERS} ${HEADERS})
 
+# disable sqlite3 dynamic lib support
+# this should really be a SOURCE property, but the way we handle
+# Fcomponent sources is making that tricky
+add_definitions(-DSQLITE_OMIT_LOAD_EXTENSION)
+
 get_property(FG_LIBS GLOBAL PROPERTY FG_LIBS)
 #message(STATUS "fg libs ${FG_LIBS}")
 #message(STATUS "OSG libs ${OPENSCENEGRAPH_LIBRARIES}")
 #message(STATUS "SG libs ${SIMGEAR_LIBRARIES}")
 
 if(RTI_FOUND)
-       find_sg_component(hla SIMGEAR_LIBRARIES)
-       find_sg_component(rti13 SIMGEAR_LIBRARIES)
-       find_sg_component(rti SIMGEAR_LIBRARIES)
        set(HLA_LIBRARIES ${RTI_LIBRARIES})
 else()
        set(HLA_LIBRARIES "")
@@ -68,6 +94,7 @@ include_directories(${PROJECT_SOURCE_DIR}/src/Canvas/ShivaVG/include)
 add_definitions(-DVG_API_EXPORT)
 
 target_link_libraries(fgfs
+       ${SQLITE3_LIBRARY}
        ${SIMGEAR_LIBRARIES}
        ${OPENSCENEGRAPH_LIBRARIES}
        ${OPENGL_LIBRARIES}