Fix for the fix: check for a viewer.

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

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index fe27f2db2a3739a36540a79c8b365cf768761915..9167ec960d99d744b4ad6082e42a93cdbfc4253a 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,12 +10,16 @@ set(SOURCES
        fg_io.cxx
        fg_os_common.cxx
        fg_props.cxx
+       FGInterpolator.cxx
        globals.cxx
        locale.cxx
        logger.cxx
        main.cxx
        options.cxx
        util.cxx
+    positioninit.cxx
+    subsystemFactory.cxx
+    screensaver_control.cxx
        ${RESOURCE_FILE}
        )
 
@@ -28,12 +28,17 @@ set(HEADERS
        fg_init.hxx
        fg_io.hxx
        fg_props.hxx
+       FGInterpolator.hxx
        globals.hxx
        locale.hxx
        logger.hxx
        main.hxx
        options.hxx
        util.hxx
+    positioninit.hxx
+    subsystemFactory.hxx
+    AircraftDirVisitorBase.hxx
+    screensaver_control.hxx
        )
 
 get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)
@@ -61,7 +66,11 @@ endforeach()
 
 source_group("Main\\Headers" FILES ${HEADERS})
 source_group("Main\\Sources" FILES ${SOURCES})
-add_executable(fgfs ${SOURCES} ${FG_SOURCES} ${FG_HEADERS} ${HEADERS})
+
+# 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}")
@@ -69,9 +78,6 @@ get_property(FG_LIBS GLOBAL PROPERTY FG_LIBS)
 #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 "")
@@ -83,11 +89,19 @@ 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(USE_DBUS)
+    target_link_libraries(fgfs ${DBUS_LIBRARIES})
+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}
@@ -98,18 +112,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()