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

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 78b93e346..b6e00a208 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -21,6 +21,7 @@ set(SOURCES
 	options.cxx
 	util.cxx
     positioninit.cxx
+    subsystemFactory.cxx
 	${RESOURCE_FILE}
 	)
 
@@ -36,6 +37,7 @@ set(HEADERS
 	options.hxx
 	util.hxx
     positioninit.hxx
+    subsystemFactory.hxx
 	)
 
 get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)
@@ -65,6 +67,11 @@ 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}")
@@ -83,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}
@@ -97,7 +106,6 @@ target_link_libraries(fgfs
 	${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
 	${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
 	${PLATFORM_LIBS}
-	ShivaVG
 )
 
 install(TARGETS fgfs RUNTIME DESTINATION bin)