Menu
▾
▴
[Flightgear-commitlogs] [FlightGear] branch next updated: Use CMake target_sources()
|
From: <fli...@li...> - 2026-05-03 20:49:49
|
unknown user pushed a commit to branch next
in repository flightgear.
The following commit(s) were added to refs/heads/next by this push:
new a4b17ea34 Use CMake target_sources()
a4b17ea34 is described below
SF URL: http://sourceforge.net/p/flightgear/flightgear/ci/a4b17ea3489c14784436aa416ed444a1dbb39814/
Commit: a4b17ea3489c14784436aa416ed444a1dbb39814
Author: James Turner
Committer: James Turner
AuthorDate: Fri May 1 09:48:04 2026 +0100
Use CMake target_sources()
---
3rdparty/mongoose/CMakeLists.txt | 12 +---------
CMakeModules/FlightGearComponent.cmake | 16 --------------
src/AIModel/CMakeLists.txt | 3 +--
src/ATC/CMakeLists.txt | 10 ++-------
src/Add-ons/CMakeLists.txt | 40 +++++++++++++++-------------------
src/Aircraft/CMakeLists.txt | 3 +--
src/Airports/CMakeLists.txt | 10 ++-------
src/Autopilot/CMakeLists.txt | 12 ++++------
src/Canvas/CMakeLists.txt | 12 ++++------
src/Environment/CMakeLists.txt | 10 ++-------
src/FDM/CMakeLists.txt | 8 +++----
src/FDM/JSBSim/CMakeLists.txt | 1 -
src/FDM/YASim/CMakeLists.txt | 5 +++--
src/GUI/CMakeLists.txt | 3 +--
src/Input/CMakeLists.txt | 3 +--
src/Instrumentation/CMakeLists.txt | 11 +++-------
src/Main/CMakeLists.txt | 10 ++-------
src/Model/CMakeLists.txt | 10 ++-------
src/MultiPlayer/CMakeLists.txt | 12 ++++------
src/Navaids/CMakeLists.txt | 10 ++-------
src/Network/CMakeLists.txt | 3 +--
src/Network/DDS/CMakeLists.txt | 5 +++--
src/Network/Swift/CMakeLists.txt | 12 ++++------
src/Network/http/CMakeLists.txt | 12 ++++------
src/Radio/CMakeLists.txt | 11 ++--------
src/Scenery/CMakeLists.txt | 5 +++--
src/Scripting/CMakeLists.txt | 4 ++--
src/Sound/CMakeLists.txt | 11 ++--------
src/Systems/CMakeLists.txt | 11 ++--------
src/Time/CMakeLists.txt | 10 ++-------
src/Traffic/CMakeLists.txt | 9 +-------
src/Translations/CMakeLists.txt | 12 ++++------
src/Viewer/CMakeLists.txt | 4 ++--
33 files changed, 89 insertions(+), 221 deletions(-)
diff --git a/3rdparty/mongoose/CMakeLists.txt b/3rdparty/mongoose/CMakeLists.txt
index 26182797d..7d7fc94b0 100644
--- a/3rdparty/mongoose/CMakeLists.txt
+++ b/3rdparty/mongoose/CMakeLists.txt
@@ -1,11 +1 @@
-include(FlightGearComponent)
-
-set(SOURCES
- mongoose.c
- )
-
-set(HEADERS
- mongoose.h
- )
-
-flightgear_component(Mongoose "${SOURCES}" "${HEADERS}")
+target_sources(fgfsObjects PRIVATE mongoose.c mongoose.h)
diff --git a/CMakeModules/FlightGearComponent.cmake b/CMakeModules/FlightGearComponent.cmake
deleted file mode 100644
index da648e98b..000000000
--- a/CMakeModules/FlightGearComponent.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-
-function(flightgear_component name sources)
- foreach(s ${sources})
- target_sources(fgfsObjects PRIVATE ${s})
- endforeach()
-
- foreach(h ${ARGV2})
- target_sources(fgfsObjects PRIVATE ${h})
- endforeach()
-
- # third argument is TEST_SOURCES
- foreach(t ${ARGV3})
- set_property(GLOBAL
- APPEND PROPERTY FG_TEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/${t}")
- endforeach()
-endfunction()
diff --git a/src/AIModel/CMakeLists.txt b/src/AIModel/CMakeLists.txt
index 3d9af46df..8def7e22b 100644
--- a/src/AIModel/CMakeLists.txt
+++ b/src/AIModel/CMakeLists.txt
@@ -1,7 +1,6 @@
# SPDX-FileCopyrightText: Copyright (C) 2010 James Turner
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
set(SOURCES
AIAircraft.cxx
@@ -60,4 +59,4 @@ if(ENABLE_SWIFT)
list(APPEND SOURCES AISwiftAircraft.cpp)
endif()
-flightgear_component(AIModel "${SOURCES}" "${HEADERS}")
+target_sources(fgfsObjects PRIVATE ${SOURCES} ${HEADERS})
diff --git a/src/ATC/CMakeLists.txt b/src/ATC/CMakeLists.txt
index d59ceee27..5cf341ad2 100644
--- a/src/ATC/CMakeLists.txt
+++ b/src/ATC/CMakeLists.txt
@@ -1,8 +1,7 @@
# SPDX-FileCopyrightText: 2010 James Turner
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
AirportGroundRadar.cxx
atc_mgr.cxx
trafficcontrol.cxx
@@ -16,9 +15,6 @@ set(SOURCES
GroundController.cxx
StartupController.cxx
TowerController.cxx
- )
-
-set(HEADERS
AirportGroundRadar.hxx
atc_mgr.hxx
trafficcontrol.hxx
@@ -33,6 +29,4 @@ set(HEADERS
StartupController.hxx
TowerController.hxx
QuadTree.hxx
- )
-
-flightgear_component(ATC "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/Add-ons/CMakeLists.txt b/src/Add-ons/CMakeLists.txt
index d4176c3f9..ae5879a04 100644
--- a/src/Add-ons/CMakeLists.txt
+++ b/src/Add-ons/CMakeLists.txt
@@ -1,26 +1,22 @@
# SPDX-FileCopyrightText: 2017 Florent Rougon
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
-set(SOURCES Addon.cxx
- AddonManager.cxx
- AddonMetadataParser.cxx
- AddonResourceProvider.cxx
- AddonVersion.cxx
- contacts.cxx
- exceptions.cxx
- )
-
-set(HEADERS addon_fwd.hxx
- Addon.hxx
- AddonManager.hxx
- AddonMetadataParser.hxx
- AddonResourceProvider.hxx
- AddonVersion.hxx
- contacts.hxx
- exceptions.hxx
- pointer_traits.hxx
- )
-
-flightgear_component(AddonManagement "${SOURCES}" "${HEADERS}")
+target_sources(fgfsObjects PRIVATE
+ Addon.cxx
+ AddonManager.cxx
+ AddonMetadataParser.cxx
+ AddonResourceProvider.cxx
+ AddonVersion.cxx
+ contacts.cxx
+ exceptions.cxx
+ addon_fwd.hxx
+ Addon.hxx
+ AddonManager.hxx
+ AddonMetadataParser.hxx
+ AddonResourceProvider.hxx
+ AddonVersion.hxx
+ contacts.hxx
+ exceptions.hxx
+ pointer_traits.hxx
+)
diff --git a/src/Aircraft/CMakeLists.txt b/src/Aircraft/CMakeLists.txt
index dff060003..b753a1154 100644
--- a/src/Aircraft/CMakeLists.txt
+++ b/src/Aircraft/CMakeLists.txt
@@ -1,7 +1,6 @@
# SPDX-FileCopyrightText: 2010 James Turner <ja...@fl...>
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
set(SOURCES
controls.cxx
@@ -26,4 +25,4 @@ set(HEADERS
)
-flightgear_component(Aircraft "${SOURCES}" "${HEADERS}")
+target_sources(fgfsObjects PRIVATE ${SOURCES} ${HEADERS})
diff --git a/src/Airports/CMakeLists.txt b/src/Airports/CMakeLists.txt
index fc77698d2..59a82dab0 100644
--- a/src/Airports/CMakeLists.txt
+++ b/src/Airports/CMakeLists.txt
@@ -1,9 +1,8 @@
# SPDX-FileCopyrightText: 2010 James Turner
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
apt_loader.cxx
dynamicloader.cxx
dynamics.cxx
@@ -20,9 +19,6 @@ set(SOURCES
xmlloader.cxx
airportdynamicsmanager.cxx
AirportBuilder.cxx
- )
-
-set(HEADERS
airports_fwd.hxx
apt_loader.hxx
dynamicloader.hxx
@@ -40,6 +36,4 @@ set(HEADERS
xmlloader.hxx
airportdynamicsmanager.hxx
AirportBuilder.hxx
- )
-
-flightgear_component(Airports "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/Autopilot/CMakeLists.txt b/src/Autopilot/CMakeLists.txt
index 856b90372..1bb35c978 100644
--- a/src/Autopilot/CMakeLists.txt
+++ b/src/Autopilot/CMakeLists.txt
@@ -1,6 +1,7 @@
-include(FlightGearComponent)
+# SPDX-FileCopyrightText: 2010 James Turner
+# SPDX-License-Identifier: GPL-2.0-or-later
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
analogcomponent.cxx
autopilot.cxx
autopilotgroup.cxx
@@ -13,9 +14,6 @@ set(SOURCES
pisimplecontroller.cxx
predictor.cxx
route_mgr.cxx
- )
-
-set(HEADERS
analogcomponent.hxx
autopilot.hxx
autopilotgroup.hxx
@@ -28,6 +26,4 @@ set(HEADERS
pisimplecontroller.hxx
predictor.hxx
route_mgr.hxx
- )
-
-flightgear_component(Autopilot "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/Canvas/CMakeLists.txt b/src/Canvas/CMakeLists.txt
index f632ecfb9..e6208096f 100644
--- a/src/Canvas/CMakeLists.txt
+++ b/src/Canvas/CMakeLists.txt
@@ -1,17 +1,13 @@
-include(FlightGearComponent)
+# SPDX-FileCopyrightText: 2013 Thomas Geymayer
+# SPDX-License-Identifier: GPL-2.0-or-later
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
canvas_mgr.cxx
FGCanvasSystemAdapter.cxx
texture_replace.cxx
-)
-
-set(HEADERS
canvas_mgr.hxx
FGCanvasSystemAdapter.hxx
gui_mgr.hxx
texture_replace.hxx
)
-
-# gui_mgr.cxx is compiled differently for testing
-flightgear_component(Canvas "${SOURCES}" "${HEADERS}" gui_mgr.cxx)
+set_property(GLOBAL APPEND PROPERTY FG_TEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/gui_mgr.cxx")
diff --git a/src/Environment/CMakeLists.txt b/src/Environment/CMakeLists.txt
index 8198ac16a..4acd41b60 100644
--- a/src/Environment/CMakeLists.txt
+++ b/src/Environment/CMakeLists.txt
@@ -1,9 +1,8 @@
# SPDX-FileCopyrightText: 2010 James Turner
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
atmosphere.cxx
environment.cxx
environment_ctrl.cxx
@@ -21,9 +20,6 @@ set(SOURCES
presets.cxx
gravity.cxx
magvarmanager.cxx
- )
-
-set(HEADERS
atmosphere.hxx
environment.hxx
environment_ctrl.hxx
@@ -41,6 +37,4 @@ set(HEADERS
presets.hxx
gravity.hxx
magvarmanager.hxx
- )
-
-flightgear_component(Environment "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/FDM/CMakeLists.txt b/src/FDM/CMakeLists.txt
index 9743617cd..045f310d2 100644
--- a/src/FDM/CMakeLists.txt
+++ b/src/FDM/CMakeLists.txt
@@ -1,4 +1,5 @@
-include(FlightGearComponent)
+# SPDX-FileCopyrightText: 2010 James Turner
+# SPDX-License-Identifier: GPL-2.0-or-later
if(SP_FDMS)
set(SP_FDM_SOURCES
@@ -18,7 +19,7 @@ set (SP_FDM_HEADERS
SP/AISim.hpp
)
endif()
-
+
set(SOURCES
NullFDM.cxx
UFO.cxx
@@ -51,7 +52,7 @@ set(HEADERS
ls_matrix.h
)
-flightgear_component(FDM "${SOURCES}" "${HEADERS}")
+target_sources(fgfsObjects PRIVATE ${SOURCES} ${HEADERS})
if(ENABLE_YASIM)
add_subdirectory(YASim)
@@ -61,4 +62,3 @@ endif()
if(ENABLE_JSBSIM)
add_subdirectory(JSBSim)
endif()
-
diff --git a/src/FDM/JSBSim/CMakeLists.txt b/src/FDM/JSBSim/CMakeLists.txt
index 5f7eb2946..65a4dc1cc 100644
--- a/src/FDM/JSBSim/CMakeLists.txt
+++ b/src/FDM/JSBSim/CMakeLists.txt
@@ -1,4 +1,3 @@
-include(FlightGearComponent)
set(HEADERS
FGFDMExec.h
diff --git a/src/FDM/YASim/CMakeLists.txt b/src/FDM/YASim/CMakeLists.txt
index 8a63959f1..de3ffe404 100644
--- a/src/FDM/YASim/CMakeLists.txt
+++ b/src/FDM/YASim/CMakeLists.txt
@@ -1,4 +1,5 @@
-include(FlightGearComponent)
+# SPDX-FileCopyrightText: 2010 James Turner
+# SPDX-License-Identifier: GPL-2.0-or-later
set(COMMON
Airplane.cpp
@@ -36,7 +37,7 @@ set(SOURCES
FGGround.cpp
)
-flightgear_component(YASim "${SOURCES}")
+target_sources(fgfsObjects PRIVATE ${SOURCES})
add_executable(yasim yasim-test.cpp ${COMMON})
add_executable(yasim-proptest proptest.cpp ${COMMON})
diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 879fa2e32..b40239ca8 100644
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -1,7 +1,6 @@
# SPDX-FileCopyrightText: 2010 James Turner <ja...@fl...>
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
set(SOURCES
AirportListModel.cxx
@@ -247,7 +246,7 @@ if (HAVE_QT)
endif()
-flightgear_component(GUI "${SOURCES}" "${HEADERS}")
+target_sources(fgfsObjects PRIVATE ${SOURCES} ${HEADERS})
if (APPLE)
# PCH doesn't work for Objective-C++
diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt
index cde72863e..4fc7208ed 100644
--- a/src/Input/CMakeLists.txt
+++ b/src/Input/CMakeLists.txt
@@ -1,7 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# SPDX-FileCopyrightText: 2011 James Turner <ja...@fl...>
-include(FlightGearComponent)
IF(APPLE)
# no Mac implementation, use HID
@@ -96,4 +95,4 @@ if (ENABLE_HID_INPUT)
endif()
endif()
-flightgear_component(Input "${SOURCES}" "${HEADERS}")
+target_sources(fgfsObjects PRIVATE ${SOURCES} ${HEADERS})
diff --git a/src/Instrumentation/CMakeLists.txt b/src/Instrumentation/CMakeLists.txt
index 5cfa717ac..193db69b2 100644
--- a/src/Instrumentation/CMakeLists.txt
+++ b/src/Instrumentation/CMakeLists.txt
@@ -1,6 +1,7 @@
-include(FlightGearComponent)
+# SPDX-FileCopyrightText: 2010 James Turner
+# SPDX-License-Identifier: GPL-2.0-or-later
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
AbstractInstrument.cxx
adf.cxx
airspeed_indicator.cxx
@@ -33,9 +34,6 @@ set(SOURCES
transponder.cxx
turn_indicator.cxx
vertical_speed_indicator.cxx
- )
-
-set(HEADERS
AbstractInstrument.hxx
adf.hxx
airspeed_indicator.hxx
@@ -69,6 +67,3 @@ set(HEADERS
turn_indicator.hxx
vertical_speed_indicator.hxx
)
-
-
-flightgear_component(Instruments "${SOURCES}" "${HEADERS}")
diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 41ca847f6..788aa34a0 100644
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -2,7 +2,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# CMake module includes.
-include(FlightGearComponent)
include(SetupFGFSBundle)
include(SetupFGFSEmbeddedResources)
include(SetupFGFSIncludes)
@@ -13,8 +12,7 @@ if(MSVC)
set(MS_RESOURCE_FILE flightgear.rc)
endif(MSVC)
-set(SOURCES
-
+target_sources(fgfsObjects PRIVATE
fg_commands.cxx
fg_init.cxx
fg_io.cxx
@@ -34,9 +32,6 @@ set(SOURCES
util.cxx
ErrorReporter.cxx
${MS_RESOURCE_FILE}
-)
-
-set(HEADERS
AircraftDirVisitorBase.hxx
fg_commands.hxx
fg_init.hxx
@@ -56,8 +51,7 @@ set(HEADERS
ErrorReporter.hxx
sentryIntegration.hxx
)
-
-flightgear_component(Main "${SOURCES}" "${HEADERS}" sentryIntegration.cxx)
+set_property(GLOBAL APPEND PROPERTY FG_TEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/sentryIntegration.cxx")
# the main() function
set(MAIN_SOURCE
diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index 071d8048e..7c31eea2a 100644
--- a/src/Model/CMakeLists.txt
+++ b/src/Model/CMakeLists.txt
@@ -1,18 +1,12 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# SPDX-FileCopyrightText: 2011 James Turner <ja...@fl...>
-include(FlightGearComponent)
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
acmodel.cxx
modelmgr.cxx
validateSharedModels.cxx
- )
-
-set(HEADERS
acmodel.hxx
modelmgr.hxx
validateSharedModels.hxx
- )
-
-flightgear_component(Model "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/MultiPlayer/CMakeLists.txt b/src/MultiPlayer/CMakeLists.txt
index 8a59ad3de..4d14a5db3 100644
--- a/src/MultiPlayer/CMakeLists.txt
+++ b/src/MultiPlayer/CMakeLists.txt
@@ -1,20 +1,16 @@
-include(FlightGearComponent)
+# SPDX-FileCopyrightText: 2010 James Turner
+# SPDX-License-Identifier: GPL-2.0-or-later
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
multiplaymgr.cxx
tiny_xdr.cxx
MPServerResolver.cxx
mpirc.cxx
cpdlc.cxx
- )
-
-set(HEADERS
multiplaymgr.hxx
tiny_xdr.hxx
MPServerResolver.hxx
mpirc.hxx
cpdlc.hxx
mpmessages.hxx
- )
-
-flightgear_component(MultiPlayer "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/Navaids/CMakeLists.txt b/src/Navaids/CMakeLists.txt
index e92976455..87d94d8a1 100644
--- a/src/Navaids/CMakeLists.txt
+++ b/src/Navaids/CMakeLists.txt
@@ -1,9 +1,8 @@
# SPDX-FileCopyrightText: 2010 James Turner
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
airways.cxx
fixlist.cxx
markerbeacon.cxx
@@ -22,9 +21,6 @@ set(SOURCES
PositionedOctree.cxx
PolyLine.cxx
SHPParser.cxx
- )
-
-set(HEADERS
airways.hxx
fixlist.hxx
markerbeacon.hxx
@@ -44,6 +40,4 @@ set(HEADERS
PolyLine.hxx
SHPParser.hxx
CacheSchema.h
- )
-
-flightgear_component(Navaids "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/Network/CMakeLists.txt b/src/Network/CMakeLists.txt
index 38b76551c..19727b9b1 100644
--- a/src/Network/CMakeLists.txt
+++ b/src/Network/CMakeLists.txt
@@ -1,7 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# SPDX-FileCopyrightText: 2010 James Turner <ja...@fl...>
-include(FlightGearComponent)
set(SOURCES
ATC-Inputs.cxx
@@ -80,7 +79,7 @@ if(ENABLE_IAX)
list(APPEND HEADERS fgcom.hxx)
endif()
-flightgear_component(Network "${SOURCES}" "${HEADERS}")
+target_sources(fgfsObjects PRIVATE ${SOURCES} ${HEADERS})
if (CycloneDDS_FOUND)
add_subdirectory(DDS)
diff --git a/src/Network/DDS/CMakeLists.txt b/src/Network/DDS/CMakeLists.txt
index 745238150..7b55934fc 100644
--- a/src/Network/DDS/CMakeLists.txt
+++ b/src/Network/DDS/CMakeLists.txt
@@ -1,4 +1,5 @@
-include(FlightGearComponent)
+# SPDX-FileCopyrightText: 2020 Erik Hofman
+# SPDX-License-Identifier: GPL-2.0-or-later
set(SOURCES
dds_ctrls.c
@@ -31,4 +32,4 @@ add_executable(fg_dds_prop
setup_fgfs_libraries(fg_dds_prop)
-flightgear_component(Network "${SOURCES}" "${HEADERS}")
+target_sources(fgfsObjects PRIVATE ${SOURCES} ${HEADERS})
diff --git a/src/Network/Swift/CMakeLists.txt b/src/Network/Swift/CMakeLists.txt
index f2a2a3b67..d7a00231e 100644
--- a/src/Network/Swift/CMakeLists.txt
+++ b/src/Network/Swift/CMakeLists.txt
@@ -1,6 +1,7 @@
-include(FlightGearComponent)
+# SPDX-FileCopyrightText: 2019 Lars Toenning
+# SPDX-License-Identifier: GPL-2.0-or-later
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
swift_connection.cxx
dbusconnection.cpp
dbusobject.cpp
@@ -12,9 +13,6 @@ set(SOURCES
service.cpp
traffic.cpp
SwiftAircraftManager.cpp
- )
-
-set(HEADERS
swift_connection.hxx
dbusconnection.h
dbusobject.h
@@ -27,6 +25,4 @@ set(HEADERS
service.h
traffic.h
SwiftAircraftManager.h
- )
-
-flightgear_component(Swift "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/Network/http/CMakeLists.txt b/src/Network/http/CMakeLists.txt
index 5f426515b..3ffd79124 100644
--- a/src/Network/http/CMakeLists.txt
+++ b/src/Network/http/CMakeLists.txt
@@ -1,6 +1,7 @@
-include(FlightGearComponent)
+# SPDX-FileCopyrightText: 2014 Torsten Dreyer
+# SPDX-License-Identifier: GPL-2.0-or-later
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
httpd.cxx
ScreenshotUriHandler.cxx
PropertyUriHandler.cxx
@@ -14,9 +15,6 @@ set(SOURCES
PropertyChangeObserver.cxx
jsonprops.cxx
SimpleDOM.cxx
- )
-
-set(HEADERS
urihandler.hxx
httpd.hxx
ScreenshotUriHandler.hxx
@@ -33,6 +31,4 @@ set(HEADERS
MirrorPropertyTreeWebsocket.hxx
jsonprops.hxx
SimpleDOM.hxx
- )
-
-flightgear_component(Http "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/Radio/CMakeLists.txt b/src/Radio/CMakeLists.txt
index 1faf5f0ec..b11c45691 100644
--- a/src/Radio/CMakeLists.txt
+++ b/src/Radio/CMakeLists.txt
@@ -1,17 +1,10 @@
# SPDX-FileCopyrightText: 2010 James Turner
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
antenna.cxx
radio.cxx
- )
-
-set(HEADERS
antenna.hxx
radio.hxx
- )
-
-
-flightgear_component(Radio "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/Scenery/CMakeLists.txt b/src/Scenery/CMakeLists.txt
index b8cf83c34..0465b1c98 100644
--- a/src/Scenery/CMakeLists.txt
+++ b/src/Scenery/CMakeLists.txt
@@ -1,4 +1,5 @@
-include(FlightGearComponent)
+# SPDX-FileCopyrightText: 2010 James Turner
+# SPDX-License-Identifier: GPL-2.0-or-later
set(SOURCES
SceneryPager.cxx
@@ -23,4 +24,4 @@ set(HEADERS
marker.hxx
)
-flightgear_component(Scenery "${SOURCES}" "${HEADERS}")
+target_sources(fgfsObjects PRIVATE ${SOURCES} ${HEADERS})
diff --git a/src/Scripting/CMakeLists.txt b/src/Scripting/CMakeLists.txt
index d2d418a8b..27763457b 100644
--- a/src/Scripting/CMakeLists.txt
+++ b/src/Scripting/CMakeLists.txt
@@ -1,7 +1,6 @@
# SPDX-FileCopyrightText: 2010 James Turner
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
set(SOURCES
nasal-props.cxx
@@ -66,4 +65,5 @@ endif()
# NasalSys.cxx is passed as TEST_SOURCES since we need to compile it
# separately when building the test_suite
-flightgear_component(Scripting "${SOURCES}" "${HEADERS}" NasalSys.cxx)
+target_sources(fgfsObjects PRIVATE ${SOURCES} ${HEADERS})
+set_property(GLOBAL APPEND PROPERTY FG_TEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/NasalSys.cxx")
diff --git a/src/Sound/CMakeLists.txt b/src/Sound/CMakeLists.txt
index b2839b9c1..7da31e201 100644
--- a/src/Sound/CMakeLists.txt
+++ b/src/Sound/CMakeLists.txt
@@ -1,9 +1,8 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# SPDX-FileCopyrightText: 2011 James Turner <ja...@fl...>
-include(FlightGearComponent)
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
audioident.cxx
soundgenerator.cxx
beacon.cxx
@@ -13,10 +12,6 @@ set(SOURCES
voice.cxx
voiceplayer.cxx
soundmanager.cxx
-
- )
-
-set(HEADERS
audioident.hxx
soundgenerator.hxx
beacon.hxx
@@ -28,9 +23,7 @@ set(HEADERS
soundmanager.hxx
VoiceSynthesizer.hxx
flitevoice.hxx
- )
-
-flightgear_component(Sound "${SOURCES}" "${HEADERS}")
+)
add_library(fgvoicesynth STATIC VoiceSynthesizer.cxx flitevoice.cxx)
target_link_libraries(fgvoicesynth PRIVATE flightgear_flite_hts SimGearScene)
diff --git a/src/Systems/CMakeLists.txt b/src/Systems/CMakeLists.txt
index b3515e7be..8355506cf 100644
--- a/src/Systems/CMakeLists.txt
+++ b/src/Systems/CMakeLists.txt
@@ -1,23 +1,16 @@
# SPDX-FileCopyrightText: 2010 James Turner <ja...@fl...>
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
electrical.cxx
pitot.cxx
static.cxx
system_mgr.cxx
vacuum.cxx
- )
-
-set(HEADERS
electrical.hxx
pitot.hxx
static.hxx
system_mgr.hxx
vacuum.hxx
- )
-
-
-flightgear_component(Systems "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/Time/CMakeLists.txt b/src/Time/CMakeLists.txt
index 2de807e5b..dad9419af 100644
--- a/src/Time/CMakeLists.txt
+++ b/src/Time/CMakeLists.txt
@@ -1,20 +1,14 @@
# SPDX-FileCopyrightText: 2010 James Turner <ja...@fl...>
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
TimeManager.cxx
light.cxx
tide.cxx
bodysolver.cxx
- )
-
-set(HEADERS
TimeManager.hxx
light.hxx
tide.hxx
bodysolver.hxx
- )
-
-flightgear_component(Time "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/Traffic/CMakeLists.txt b/src/Traffic/CMakeLists.txt
index 040325ab9..d7fc7164a 100644
--- a/src/Traffic/CMakeLists.txt
+++ b/src/Traffic/CMakeLists.txt
@@ -1,18 +1,11 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# SPDX-FileCopyrightText: 2011 James Turner <ja...@fl...>
-include(FlightGearComponent)
-set(SOURCES
+target_sources(fgfsObjects PRIVATE
SchedFlight.cxx
Schedule.cxx
TrafficMgr.cxx
- )
-
-set(HEADERS
SchedFlight.hxx
Schedule.hxx
TrafficMgr.hxx
)
-
-
-flightgear_component(Traffic "${SOURCES}" "${HEADERS}")
diff --git a/src/Translations/CMakeLists.txt b/src/Translations/CMakeLists.txt
index 18e0b151e..05a654e3f 100644
--- a/src/Translations/CMakeLists.txt
+++ b/src/Translations/CMakeLists.txt
@@ -1,24 +1,20 @@
# SPDX-FileCopyrightText: 2025 Florent Rougon
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
-set(SOURCES DefaultTranslationParser.cxx
+target_sources(fgfsObjects PRIVATE
+ DefaultTranslationParser.cxx
FGTranslate.cxx
LanguageInfo.cxx
TranslationDomain.cxx
TranslationResource.cxx
TranslationUnit.cxx
XLIFFParser.cxx
- )
-
-set(HEADERS DefaultTranslationParser.hxx
+ DefaultTranslationParser.hxx
FGTranslate.hxx
LanguageInfo.hxx
TranslationDomain.hxx
TranslationResource.hxx
TranslationUnit.hxx
XLIFFParser.hxx
- )
-
-flightgear_component(Translations "${SOURCES}" "${HEADERS}")
+)
diff --git a/src/Viewer/CMakeLists.txt b/src/Viewer/CMakeLists.txt
index 65d4ee7e8..e7c7e081c 100644
--- a/src/Viewer/CMakeLists.txt
+++ b/src/Viewer/CMakeLists.txt
@@ -1,7 +1,6 @@
# SPDX-FileCopyrightText: 2010 James Turner <ja...@fl...>
# SPDX-License-Identifier: GPL-2.0-or-later
-include(FlightGearComponent)
set(SOURCES
CameraGroup.cxx
@@ -45,4 +44,5 @@ if (ENABLE_OSGXR)
endif()
# view.cxx is compiled differently for testing
-flightgear_component(Viewer "${SOURCES}" "${HEADERS}" view.cxx)
+target_sources(fgfsObjects PRIVATE ${SOURCES} ${HEADERS})
+set_property(GLOBAL APPEND PROPERTY FG_TEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/view.cxx")
|
