CMake header support for XCode/Visual Studio

diff --git a/CMakeModules/FlightGearComponent.cmake b/CMakeModules/FlightGearComponent.cmake
index 7de5743b6c56e739fe7734441a3d2c8d751b0650..2b0daa93c6732b950d52500391bc76d484292869 100644 (file)
--- a/CMakeModules/FlightGearComponent.cmake
+++ b/CMakeModules/FlightGearComponent.cmake
@@ -2,7 +2,7 @@
 macro(flightgear_component name sources)
 
        set(libName "fg${name}")
-       add_library(${libName} STATIC ${sources} )
+       add_library(${libName} STATIC ${sources} ${ARGV2})
 
        set_property(GLOBAL APPEND PROPERTY FG_LIBS ${libName})
     

diff --git a/src/AIModel/CMakeLists.txt b/src/AIModel/CMakeLists.txt
index 8cc8f74d212a049aa6264b07b252d4d71956388d..08105fee0a26b14b9882853a8e255de9639685a3 100644 (file)
--- a/src/AIModel/CMakeLists.txt
+++ b/src/AIModel/CMakeLists.txt
@@ -23,6 +23,27 @@ set(SOURCES
        performancedb.cxx
        submodel.cxx
        )
-       
-flightgear_component(AIModel "${SOURCES}")
+
+set(HEADERS
+       AIAircraft.hxx
+       AIBallistic.hxx
+       AIBase.hxx
+       AICarrier.hxx
+       AIEscort.hxx
+       AIFlightPlan.hxx
+       AIGroundVehicle.hxx
+       AIManager.hxx
+       AIMultiplayer.hxx
+       AIShip.hxx
+       AIStatic.hxx
+       AIStorm.hxx
+       AITanker.hxx
+       AIThermal.hxx
+       AIWingman.hxx
+       performancedata.hxx
+       performancedb.hxx
+       submodel.hxx
+       )
+               
+flightgear_component(AIModel "${SOURCES}" "${HEADERS}")
        
\ No newline at end of file

diff --git a/src/Aircraft/CMakeLists.txt b/src/Aircraft/CMakeLists.txt
index da519fb27e86a47aac260b9110894fb9cddf21c8..974d66559265d156fd72057616e318ab0c6e0d98 100644 (file)
--- a/src/Aircraft/CMakeLists.txt
+++ b/src/Aircraft/CMakeLists.txt
@@ -4,5 +4,11 @@ set(SOURCES
        controls.cxx
        replay.cxx
        )
-       
-flightgear_component(Aircraft "${SOURCES}")
\ No newline at end of file
+
+set(HEADERS
+       controls.hxx
+       replay.hxx
+       )
+
+
+flightgear_component(Aircraft "${SOURCES}" "${HEADERS}")
\ No newline at end of file

diff --git a/src/Airports/CMakeLists.txt b/src/Airports/CMakeLists.txt
index 5be24c7df6f98d76bd415b8c007d80146687cab0..43f2a999f7ea28ac0b8f8b55ae63d9143fddf39e 100644 (file)
--- a/src/Airports/CMakeLists.txt
+++ b/src/Airports/CMakeLists.txt
@@ -2,7 +2,6 @@ include(FlightGearComponent)
 
 set(SOURCES
        apt_loader.cxx
-       calc_loc.cxx
        dynamicloader.cxx
        dynamics.cxx
        gnnode.cxx
@@ -17,5 +16,22 @@ set(SOURCES
        simple.cxx
        xmlloader.cxx
        )
-       
-flightgear_component(Airports "${SOURCES}")
\ No newline at end of file
+
+set(HEADERS
+       apt_loader.hxx
+       dynamicloader.hxx
+       dynamics.hxx
+       gnnode.hxx
+       groundnetwork.hxx
+       parking.hxx
+       pavement.hxx
+       runwaybase.hxx
+       runwayprefloader.hxx
+       runwayprefs.hxx
+       runways.hxx
+       sidstar.hxx
+       simple.hxx
+       xmlloader.hxx
+       )
+               
+flightgear_component(Airports "${SOURCES}" "${HEADERS}")
\ No newline at end of file

diff --git a/src/Autopilot/CMakeLists.txt b/src/Autopilot/CMakeLists.txt
index 23f297d2aef48dce8cdadc8fe31ef5b1760bc942..130edc0abda50237d5872e2c05210601f0166f94 100644 (file)
--- a/src/Autopilot/CMakeLists.txt
+++ b/src/Autopilot/CMakeLists.txt
@@ -16,4 +16,20 @@ set(SOURCES
        route_mgr.cxx
        )
        
-flightgear_component(Autopilot "${SOURCES}")
\ No newline at end of file
+set(HEADERS
+       analogcomponent.hxx
+       autopilot.hxx
+       autopilotgroup.hxx
+       component.hxx
+       digitalcomponent.hxx
+       digitalfilter.hxx
+       flipflop.hxx
+       inputvalue.hxx
+       logic.hxx
+       pidcontroller.hxx
+       pisimplecontroller.hxx
+       predictor.hxx
+       route_mgr.hxx
+       )
+       
+flightgear_component(Autopilot "${SOURCES}" "${HEADERS}")
\ No newline at end of file

diff --git a/src/Cockpit/CMakeLists.txt b/src/Cockpit/CMakeLists.txt
index a9a070d74ab1a73039279edf6613a05c33a4896e..d68022e7771784e5f78ad17b94516e00fd164cb0 100644 (file)
--- a/src/Cockpit/CMakeLists.txt
+++ b/src/Cockpit/CMakeLists.txt
@@ -6,4 +6,11 @@ set(SOURCES
        built_in/FGMagRibbon.cxx
        )
        
-flightgear_component(Cockpit "${SOURCES}")
\ No newline at end of file
+set(HEADERS
+       panel.hxx
+       panel_io.hxx
+       built_in/FGMagRibbon.hxx
+       )
+
+
+flightgear_component(Cockpit "${SOURCES}" "${HEADERS}")
\ No newline at end of file

diff --git a/src/Environment/CMakeLists.txt b/src/Environment/CMakeLists.txt
index ada06638e552ffaa647613fd9acd74454a01b000..3007eb7814c234372b15da0be349dccec3ab9c28 100644 (file)
--- a/src/Environment/CMakeLists.txt
+++ b/src/Environment/CMakeLists.txt
@@ -18,5 +18,24 @@ set(SOURCES
        presets.cxx
        gravity.cxx
        )
-       
-flightgear_component(Environment "${SOURCES}")
+
+set(HEADERS
+       atmosphere.hxx
+       environment.hxx
+       environment_ctrl.hxx
+       environment_mgr.hxx
+       ephemeris.hxx
+       fgclouds.hxx
+       fgmetar.hxx
+       fgwind.hxx
+       metarairportfilter.hxx
+       metarproperties.hxx
+       precipitation_mgr.hxx
+       realwx_ctrl.hxx
+       ridge_lift.hxx
+       terrainsampler.hxx
+       presets.hxx
+       gravity.hxx
+       )
+               
+flightgear_component(Environment "${SOURCES}" "${HEADERS}")

diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 706219c741e7506fbd850510390d913b3fe479e4..428cdcb9e905fb2e683b0190b0cf8a5aebc93655 100644 (file)
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -15,5 +15,18 @@ set(SOURCES
        new_gui.cxx
        property_list.cxx
        )
-       
-flightgear_component(GUI "${SOURCES}")
+
+set(HEADERS
+       AirportList.hxx
+       MapWidget.hxx
+       SafeTexFont.hxx
+       WaypointList.hxx
+       dialog.hxx
+       gui.h
+       layout.hxx
+       menubar.hxx
+       new_gui.hxx
+       property_list.hxx
+       )
+               
+flightgear_component(GUI "${SOURCES}" "${HEADERS}")

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index d28d78d26a571436d0579f434936b9f49eddfdca..c03bdaeeda7dcfbd19af9df2ae173a8f8a978165 100644 (file)
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -31,8 +31,29 @@ set(SOURCES
        viewmgr.cxx
        ${RESOURCE_FILE}
        )
-       
-add_executable(fgfs ${SOURCES})
+
+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} ${HEADERS})
 
 get_property(FG_LIBS GLOBAL PROPERTY FG_LIBS)
 #message(STATUS "fg libs ${FG_LIBS}")

diff --git a/src/Navaids/CMakeLists.txt b/src/Navaids/CMakeLists.txt
index 8f27472701659101d62304d701990b097022ccbe..05a999cb3c3a5ec325a4d89e01db521252f15abc 100644 (file)
--- a/src/Navaids/CMakeLists.txt
+++ b/src/Navaids/CMakeLists.txt
@@ -2,7 +2,6 @@ include(FlightGearComponent)
 
 set(SOURCES
        airways.cxx
-       awynet.cxx
        fixlist.cxx
        markerbeacon.cxx
        navdb.cxx
@@ -16,4 +15,19 @@ set(SOURCES
        PositionedBinding.cxx
        )
 
-flightgear_component(Navaids "${SOURCES}")
\ No newline at end of file
+set(HEADERS
+    airways.hxx
+       fixlist.hxx
+       markerbeacon.hxx
+       navdb.hxx
+       navlist.hxx
+       navrecord.hxx
+       positioned.hxx
+       procedure.hxx
+       route.hxx
+       routePath.hxx
+       waypoint.hxx
+       PositionedBinding.hxx
+    )
+
+flightgear_component(Navaids "${SOURCES}" "${HEADERS}")
\ No newline at end of file