Fix shared library build for metar executable

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

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 51dbead5a1fd52f59958b1a19f2901b43e9eb849..827e09f80c204f9f1eef63b70a914d9c0e39d29f 100644 (file)
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -1,4 +1,12 @@
 
+if (MSVC)
+       if (CMAKE_CL_64)
+               set( RESOURCE_FILE flightgear64.rc )
+       else (CMAKE_CL_64)
+               set( RESOURCE_FILE flightgear.rc )
+       endif (CMAKE_CL_64)
+endif (MSVC)
+
 set(SOURCES
        CameraGroup.cxx
        FGEventHandler.cxx
@@ -21,25 +29,68 @@ set(SOURCES
        util.cxx
        viewer.cxx
        viewmgr.cxx
+       ${RESOURCE_FILE}
+       )
+
+set(HEADERS
+       CameraGroup.hxx
+       FGEventHandler.hxx
+       WindowBuilder.hxx
+       WindowSystemAdapter.hxx
+       fg_commands.hxx
+       fg_init.hxx
+       fg_io.hxx
+       fg_props.hxx
+       fgviewer.hxx
+       globals.hxx
+       logger.hxx
+       main.hxx
+       options.hxx
+       renderer.hxx
+       splash.hxx
+       util.hxx
+       viewer.hxx
+       viewmgr.hxx
        )
-       
-add_executable(fgfs ${SOURCES})
+
+add_executable(fgfs ${SOURCES} ${HEADERS})
 
 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}")
 
-target_link_libraries(fgfs 
+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 "")
+endif()
+
+target_link_libraries(fgfs
        ${FG_LIBS}
-       ${JS_LIBS}
        ${SIMGEAR_LIBRARIES}
-       ${OPENSCENEGRAPH_LIBRARIES} 
-       ${OPENAL_LIBRARY} 
+       ${OPENSCENEGRAPH_LIBRARIES}
        ${OPENGL_LIBRARIES}
-       ${ALUT_LIBRARY} 
-       ${ZLIB_LIBRARIES}
        ${PLIB_LIBRARIES}
-       ${RT_LIBRARY})
-       
+       ${JPEG_LIBRARY}
+       ${HLA_LIBRARIES}
+       ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
+       ${SIMGEAR_SCENE_LIBRARY_DEPENDENCIES}
+       ${PLATFORM_LIBS}
+)
+
 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}
+)
+
+install(TARGETS metar RUNTIME DESTINATION bin)
+