X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FMain%2FCMakeLists.txt;h=b6e00a208909688c9b833f079b6724f62835a7c7;hb=379e7a2fd56efc65887b55e419723903447d462d;hp=fe27f2db2a3739a36540a79c8b365cf768761915;hpb=db53e4c0b860c7242a20c704982a20ab4c356594;p=flightgear.git

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index fe27f2db2..b6e00a208 100644
--- 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)
@@ -63,15 +67,17 @@ 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 "")
@@ -84,10 +90,12 @@ if(ENABLE_JSBSIM)
     target_link_libraries(fgfs JSBSim)
 endif()
 
-include_directories(${PROJECT_SOURCE_DIR}/src/Canvas/ShivaVG/include)
-add_definitions(-DVG_API_EXPORT)
+if(FG_HAVE_GPERFTOOLS)
+    target_link_libraries(fgfs profiler tcmalloc)
+endif()
 
 target_link_libraries(fgfs
+	${SQLITE3_LIBRARY}
 	${SIMGEAR_LIBRARIES}
 	${OPENSCENEGRAPH_LIBRARIES}
 	${OPENGL_LIBRARIES}
@@ -98,7 +106,6 @@ target_link_libraries(fgfs
 	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
 	${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
 	${PLATFORM_LIBS}
-	ShivaVG
 )
 
 install(TARGETS fgfs RUNTIME DESTINATION bin)