Reset: clear effects cache

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

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 760c4d1395565a5160900ddfff7a015b13ae175d..aeade6aa0e271e60095e44b0494dfa81d263b2d0 100644 (file)
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -1,10 +1,6 @@
 
 if (MSVC)
-       if (CMAKE_CL_64)
-               set( RESOURCE_FILE flightgear64.rc )
-       else (CMAKE_CL_64)
-               set( RESOURCE_FILE flightgear.rc )
-       endif (CMAKE_CL_64)
+       set( RESOURCE_FILE flightgear.rc )
 endif (MSVC)
 
 set(SOURCES
@@ -14,6 +10,7 @@ set(SOURCES
        fg_io.cxx
        fg_os_common.cxx
        fg_props.cxx
+       FGInterpolator.cxx
        globals.cxx
        locale.cxx
        logger.cxx
@@ -21,6 +18,7 @@ set(SOURCES
        options.cxx
        util.cxx
     positioninit.cxx
+    subsystemFactory.cxx
        ${RESOURCE_FILE}
        )
 
@@ -29,6 +27,7 @@ set(HEADERS
        fg_init.hxx
        fg_io.hxx
        fg_props.hxx
+       FGInterpolator.hxx
        globals.hxx
        locale.hxx
        logger.hxx
@@ -36,6 +35,8 @@ set(HEADERS
        options.hxx
        util.hxx
     positioninit.hxx
+    subsystemFactory.hxx
+    AircraftDirVisitorBase.hxx
        )
 
 get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)
@@ -63,12 +64,11 @@ 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)
+# important we pass WIN32 here so the console is optional. Other
+# platforms ignore this option. If a console is needed we allocate
+# it manually via AllocConsole()
+add_executable(fgfs WIN32 ${SOURCES} ${FG_SOURCES} ${FG_HEADERS} ${HEADERS})
 
 get_property(FG_LIBS GLOBAL PROPERTY FG_LIBS)
 #message(STATUS "fg libs ${FG_LIBS}")
@@ -87,11 +87,16 @@ if(ENABLE_JSBSIM)
     
     target_link_libraries(fgfs JSBSim)
 endif()
-
-include_directories(${PROJECT_SOURCE_DIR}/src/Canvas/ShivaVG/include)
-add_definitions(-DVG_API_EXPORT)
+if(ENABLE_IAX)
+    target_link_libraries(fgfs iaxclient_lib ${OPENAL_LIBRARY})
+endif()
+if(FG_HAVE_GPERFTOOLS)
+    include_directories(${GooglePerfTools_INCLUDE_DIR})
+    target_link_libraries(fgfs ${GooglePerfTools_LIBRARIES})
+endif()
 
 target_link_libraries(fgfs
+       ${SQLITE3_LIBRARY}
        ${SIMGEAR_LIBRARIES}
        ${OPENSCENEGRAPH_LIBRARIES}
        ${OPENGL_LIBRARIES}
@@ -102,18 +107,18 @@ 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}
-       ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
-       ${PLATFORM_LIBS}
-)
+if(ENABLE_METAR)
+    add_executable(metar metar_main.cxx)
+    target_link_libraries(metar
+        ${SIMGEAR_LIBRARIES}
+        ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+        ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
+        ${PLATFORM_LIBS}
+    )
 
-install(TARGETS metar RUNTIME DESTINATION bin)
+    install(TARGETS metar RUNTIME DESTINATION bin)
+endif()