fly/flightgear
1
0
Fork 0
Code Activity
flightgear/src/Main/CMakeLists.txt

122 lines
3 KiB
Text
Raw Normal View History

CMake: Shifted the target setup code into its own CMake module. This is for simplifying the main src/Main/CMakeLists.txt file and allowing the code to be shared with the test suite.
2018-03-25 12:18:24 +00:00
# CMake module includes.
CMake: The main sources/headers have been shifted into FG_{SOURCES,HEADERS}. This allows the sources and headers in src/Main/ to be used by other targets. They are grouped into the new "Main" flightgear component via the macro in the FlightGearComponent CMake module. The bootstrap.cxx file with its main function has been separated out into a separate variable MAIN_SOURCE for use by the fgfs binary. All these files have therefore been removed from the test_suite CMakeLists.txt file, as they are added via FG_SOURCES and FG_HEADERS. The MSVC grouping code also does not need to deal with the now deleted separate SOURCE and HEADER variables for these files.
2018-03-26 18:27:12 +00:00
include(FlightGearComponent)
CMake: Shifted the Mac bundle commands into its own CMake module.
2018-03-25 16:51:10 +00:00
include(SetupFGFSBundle)
CMake: Shifted the FlightGear embedded resources code into its own CMake module. This is for simplifying the main src/Main/CMakeLists.txt file and allowing the code to be shared with the test suite. The generated source and header files have also been removed from the main source list and placed in the CMake module as the global variables EMBEDDED_RESOURCE_SOURCES and EMBEDDED_RESOURCE_HEADERS.
2018-03-25 12:29:02 +00:00
include(SetupFGFSEmbeddedResources)
CMake: Split the target links and includes into separate CMake modules.
2018-03-26 20:27:25 +00:00
include(SetupFGFSIncludes)
CMake: Shifted the target setup code into its own CMake module. This is for simplifying the main src/Main/CMakeLists.txt file and allowing the code to be shared with the test suite.
2018-03-25 12:18:24 +00:00
include(SetupFGFSLibraries)
CMake: Shifted the MSVC grouping code into its own CMake module. This is for simplifying the main src/Main/CMakeLists.txt file and allowing the code to be shared with the test suite.
2018-03-25 12:35:46 +00:00
include(SetupMSVCGrouping)
Initial work on CMake build files, with considerable help from Olaf Flebbe.
2010-11-30 10:08:30 +00:00
CMake: The main sources/headers have been shifted into FG_{SOURCES,HEADERS}. This allows the sources and headers in src/Main/ to be used by other targets. They are grouped into the new "Main" flightgear component via the macro in the FlightGearComponent CMake module. The bootstrap.cxx file with its main function has been separated out into a separate variable MAIN_SOURCE for use by the fgfs binary. All these files have therefore been removed from the test_suite CMakeLists.txt file, as they are added via FG_SOURCES and FG_HEADERS. The MSVC grouping code also does not need to deal with the now deleted separate SOURCE and HEADER variables for these files.
2018-03-26 18:27:12 +00:00
# Set up the Main FG file sources and headers (excluding bootstrap.cxx and its main() function).
Main: Formatting standardization for the src/Main/CMakeLists.txt file. This includes spacing, tab to space replacements, and alphabetical ordering.
2018-03-02 21:18:28 +00:00
if(MSVC)
CMake: The main sources/headers have been shifted into FG_{SOURCES,HEADERS}. This allows the sources and headers in src/Main/ to be used by other targets. They are grouped into the new "Main" flightgear component via the macro in the FlightGearComponent CMake module. The bootstrap.cxx file with its main function has been separated out into a separate variable MAIN_SOURCE for use by the fgfs binary. All these files have therefore been removed from the test_suite CMakeLists.txt file, as they are added via FG_SOURCES and FG_HEADERS. The MSVC grouping code also does not need to deal with the now deleted separate SOURCE and HEADER variables for these files.
2018-03-26 18:27:12 +00:00
set(MS_RESOURCE_FILE flightgear.rc)
Main: Formatting standardization for the src/Main/CMakeLists.txt file. This includes spacing, tab to space replacements, and alphabetical ordering.
2018-03-02 21:18:28 +00:00
endif(MSVC)
Cmake: set an icon to the Windows executable
2011-01-28 18:30:27 +00:00
Initial work on CMake build files, with considerable help from Olaf Flebbe.
2010-11-30 10:08:30 +00:00
set(SOURCES
Main: Formatting standardization for the src/Main/CMakeLists.txt file. This includes spacing, tab to space replacements, and alphabetical ordering.
2018-03-02 21:18:28 +00:00
fg_commands.cxx
fg_init.cxx
fg_io.cxx
fg_os_common.cxx
fg_scene_commands.cxx
fg_props.cxx
FGInterpolator.cxx
globals.cxx
locale.cxx
logger.cxx
main.cxx
options.cxx
Sink position-init code into its own file. Separate other init functions from position init, since they are unrelated, and made fg_init.cxx very complex. Next step will be brining some sanity to the position init logic :)
2012-09-18 19:50:28 +00:00
positioninit.cxx
Disable screensaver: initial Linux-only implementation Add a function fgOSDisableScreensaver() that attempts to disable the screensaver (currently only succeeding on Linux), and call it on startup. CMake option USE_DBUS (on by default), requires libdbus-1 Motivation: most screensavers do not monitor the joystick https://bugs.launchpad.net/ubuntu/+source/flightgear/+bug/793599 Discussion: http://sourceforge.net/p/flightgear/mailman/message/31717061/
2013-12-09 00:13:44 +00:00
screensaver_control.cxx
Main: Formatting standardization for the src/Main/CMakeLists.txt file. This includes spacing, tab to space replacements, and alphabetical ordering.
2018-03-02 21:18:28 +00:00
subsystemFactory.cxx
util.cxx
Load translations from XLIFF format When an <xliff> entry is present inside a locale specification, this takes precedence over the legacy translations.
2018-08-11 14:13:46 +00:00
XLIFFParser.cxx
Add error reporting subsystem Requires corresponding SimGear commit
2021-02-09 16:56:12 +00:00
ErrorReporter.cxx
CMake: The main sources/headers have been shifted into FG_{SOURCES,HEADERS}. This allows the sources and headers in src/Main/ to be used by other targets. They are grouped into the new "Main" flightgear component via the macro in the FlightGearComponent CMake module. The bootstrap.cxx file with its main function has been separated out into a separate variable MAIN_SOURCE for use by the fgfs binary. All these files have therefore been removed from the test_suite CMakeLists.txt file, as they are added via FG_SOURCES and FG_HEADERS. The MSVC grouping code also does not need to deal with the now deleted separate SOURCE and HEADER variables for these files.
2018-03-26 18:27:12 +00:00
${MS_RESOURCE_FILE}
Main: Formatting standardization for the src/Main/CMakeLists.txt file. This includes spacing, tab to space replacements, and alphabetical ordering.
2018-03-02 21:18:28 +00:00
)
CMake header support for XCode/Visual Studio
2011-06-26 06:49:37 +00:00
set(HEADERS
Refactor aircraft-dir visiting. Cap maximum depth to avoid bug 865
2013-11-16 14:22:34 +00:00
AircraftDirVisitorBase.hxx
Main: Formatting standardization for the src/Main/CMakeLists.txt file. This includes spacing, tab to space replacements, and alphabetical ordering.
2018-03-02 21:18:28 +00:00
fg_commands.hxx
fg_init.hxx
fg_io.hxx
fg_props.hxx
FGInterpolator.hxx
globals.hxx
locale.hxx
logger.hxx
main.hxx
options.hxx
positioninit.hxx
Disable screensaver: initial Linux-only implementation Add a function fgOSDisableScreensaver() that attempts to disable the screensaver (currently only succeeding on Linux), and call it on startup. CMake option USE_DBUS (on by default), requires libdbus-1 Motivation: most screensavers do not monitor the joystick https://bugs.launchpad.net/ubuntu/+source/flightgear/+bug/793599 Discussion: http://sourceforge.net/p/flightgear/mailman/message/31717061/
2013-12-09 00:13:44 +00:00
screensaver_control.hxx
Main: Formatting standardization for the src/Main/CMakeLists.txt file. This includes spacing, tab to space replacements, and alphabetical ordering.
2018-03-02 21:18:28 +00:00
subsystemFactory.hxx
util.hxx
Load translations from XLIFF format When an <xliff> entry is present inside a locale specification, this takes precedence over the legacy translations.
2018-08-11 14:13:46 +00:00
XLIFFParser.hxx
Add error reporting subsystem Requires corresponding SimGear commit
2021-02-09 16:56:12 +00:00
ErrorReporter.hxx
Switch test_suite build to use an OBJECT library Remove use of BUILDING_TESTSUITE from headers. Where possible, move test APIs to their own file in the test_suite dir (testApis.cxx). For some others, add them to a special list of ‘sources which depend on the build mode’. This will hopefully go away with some further refactoring.
2021-03-08 16:44:42 +00:00
sentryIntegration.hxx
Main: Formatting standardization for the src/Main/CMakeLists.txt file. This includes spacing, tab to space replacements, and alphabetical ordering.
2018-03-02 21:18:28 +00:00
)
CMake header support for XCode/Visual Studio
2011-06-26 06:49:37 +00:00
Switch test_suite build to use an OBJECT library Remove use of BUILDING_TESTSUITE from headers. Where possible, move test APIs to their own file in the test_suite dir (testApis.cxx). For some others, add them to a special list of ‘sources which depend on the build mode’. This will hopefully go away with some further refactoring.
2021-03-08 16:44:42 +00:00
flightgear_component(Main "${SOURCES}" "${HEADERS}" sentryIntegration.cxx)
CMake: The main sources/headers have been shifted into FG_{SOURCES,HEADERS}. This allows the sources and headers in src/Main/ to be used by other targets. They are grouped into the new "Main" flightgear component via the macro in the FlightGearComponent CMake module. The bootstrap.cxx file with its main function has been separated out into a separate variable MAIN_SOURCE for use by the fgfs binary. All these files have therefore been removed from the test_suite CMakeLists.txt file, as they are added via FG_SOURCES and FG_HEADERS. The MSVC grouping code also does not need to deal with the now deleted separate SOURCE and HEADER variables for these files.
2018-03-26 18:27:12 +00:00
Switch test_suite build to use an OBJECT library Remove use of BUILDING_TESTSUITE from headers. Where possible, move test APIs to their own file in the test_suite dir (testApis.cxx). For some others, add them to a special list of ‘sources which depend on the build mode’. This will hopefully go away with some further refactoring.
2021-03-08 16:44:42 +00:00
# the main() function
CMake: The main sources/headers have been shifted into FG_{SOURCES,HEADERS}. This allows the sources and headers in src/Main/ to be used by other targets. They are grouped into the new "Main" flightgear component via the macro in the FlightGearComponent CMake module. The bootstrap.cxx file with its main function has been separated out into a separate variable MAIN_SOURCE for use by the fgfs binary. All these files have therefore been removed from the test_suite CMakeLists.txt file, as they are added via FG_SOURCES and FG_HEADERS. The MSVC grouping code also does not need to deal with the now deleted separate SOURCE and HEADER variables for these files.
2018-03-26 18:27:12 +00:00
set(MAIN_SOURCE
bootstrap.cxx
)
CMake: Shifted the FlightGear embedded resources code into its own CMake module. This is for simplifying the main src/Main/CMakeLists.txt file and allowing the code to be shared with the test suite. The generated source and header files have also been removed from the main source list and placed in the CMake module as the global variables EMBEDDED_RESOURCE_SOURCES and EMBEDDED_RESOURCE_HEADERS.
2018-03-25 12:29:02 +00:00
# Set up the embedded resources.
setup_fgfs_embedded_resources()
Integrate the EmbeddedResourceManager into FlightGear ${CMAKE_SOURCE_DIR}/src/EmbeddedResources/FlightGear-resources.xml (currently empty) is automatically "compiled" into ${CMAKE_BINARY_DIR}/src/EmbeddedResources/FlightGear-resources.[ch]xx by fgrcc inside the build directory. These files are incorporated into the FlightGear build (FlightGear-resources.cxx is linked into FlightGear). When the XML embedded resource declaration file added here, FlightGear-resources.xml, is compiled, fgrcc is passed the --root=${CMAKE_SOURCE_DIR} option, so that files referred to in FlightGear-resources.xml are looked up relatively to the root directory of the FlightGear repository. One could use a second XML embedded resource declaration file compiled with a different --root option to grab files from FGData, for instance. I would name such a file FGData-resources.xml to be consistent with the current naming scheme. Note: this --root option applies to the paths of real files. Don't confuse it with the 'prefix' attribute of <qresource> elements inside XML resource declaration files (such as FlightGear-resources.xml), which applies to the virtual path of each resource defined beneath. The commands in src/Main/CMakeLists.txt ensure that FlightGear-resources.xml is recompiled with fgrcc whenever it is changed, and obviously also when FlightGear-resources.cxx or FlightGear-resources.hxx is missing. However, CMake doesn't know how to parse fgrcc XML resource declaration files, therefore when a resource is modified but the XML file it is declared in is not (here, FlightGear-resources.xml), you have to trigger yourself a recompilation of the XML resource declaration file to see the new resource contents inside FlightGear. The easiest ways to do so are: - either update the timestamp of the XML resource declaration file; - or remove one or both of the generated files (FlightGear-resources.cxx and FlightGear-resources.hxx here). The EmbeddedResourceManager is created in fgMainInit() just after Options::processOptions() set the language that was either requested by the user or obtained from the system (locales). Resources from FlightGear-resources.cxx are added to it, after which EmbeddedResourceManager::selectLocale() is called with the user's preferred locale (obtained with FGLocale::getPreferredLanguage()). Upon reset (fgStartNewReset()), EmbeddedResourceManager::selectLocale() is called in a similar way after Options::processOptions(), however in this case the EmbeddedResourceManager instance doesn't have to be recreated.
2017-04-27 22:09:14 +00:00
CMake: Shifted the MSVC grouping code into its own CMake module. This is for simplifying the main src/Main/CMakeLists.txt file and allowing the code to be shared with the test suite.
2018-03-25 12:35:46 +00:00
# Sort the sources and headers for MSVC.
setup_msvc_grouping()
Switch test_suite build to use an OBJECT library Remove use of BUILDING_TESTSUITE from headers. Where possible, move test APIs to their own file in the test_suite dir (testApis.cxx). For some others, add them to a special list of ‘sources which depend on the build mode’. This will hopefully go away with some further refactoring.
2021-03-08 16:44:42 +00:00
# souerces which are different for fgfs vs the test-suite
get_property(TEST_SOURCES GLOBAL PROPERTY FG_TEST_SOURCES)
Improve CMake strucutre
2020-08-19 13:49:50 +00:00
CMake: Split the target links and includes into separate CMake modules.
2018-03-26 20:27:25 +00:00
Window console changes - default to SUBSYSTEM:WINDOWS (we can still AllocConsole if needed) - add --console option to get a console on Windows - ensure --show-aircraft and --help modes show the console automatically.
2013-10-26 20:06:03 +00:00
# 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()
Use Cmake to generate app-bundle on Mac - build the .plist using CMake features - update the nightly Mac packaging script for the new layout
2014-02-14 18:58:36 +00:00
# similarly pass MACOSX_BUNDLE so we generate a .app on Mac
CMake: Shifted the FlightGear embedded resources code into its own CMake module. This is for simplifying the main src/Main/CMakeLists.txt file and allowing the code to be shared with the test suite. The generated source and header files have also been removed from the main source list and placed in the CMake module as the global variables EMBEDDED_RESOURCE_SOURCES and EMBEDDED_RESOURCE_HEADERS.
2018-03-25 12:29:02 +00:00
add_executable(fgfs
WIN32
MACOSX_BUNDLE
CMake: The main sources/headers have been shifted into FG_{SOURCES,HEADERS}. This allows the sources and headers in src/Main/ to be used by other targets. They are grouped into the new "Main" flightgear component via the macro in the FlightGearComponent CMake module. The bootstrap.cxx file with its main function has been separated out into a separate variable MAIN_SOURCE for use by the fgfs binary. All these files have therefore been removed from the test_suite CMakeLists.txt file, as they are added via FG_SOURCES and FG_HEADERS. The MSVC grouping code also does not need to deal with the now deleted separate SOURCE and HEADER variables for these files.
2018-03-26 18:27:12 +00:00
${MAIN_SOURCE}
Switch test_suite build to use an OBJECT library Remove use of BUILDING_TESTSUITE from headers. Where possible, move test APIs to their own file in the test_suite dir (testApis.cxx). For some others, add them to a special list of ‘sources which depend on the build mode’. This will hopefully go away with some further refactoring.
2021-03-08 16:44:42 +00:00
${TEST_SOURCES}
Switch to using OBJECT library for main build Allows sharing object files between the fgfs and test_suite targets, in a follow-up commit.
2021-03-08 15:53:53 +00:00
$<TARGET_OBJECTS:fgfsObjects>
CMake: Shifted the FlightGear embedded resources code into its own CMake module. This is for simplifying the main src/Main/CMakeLists.txt file and allowing the code to be shared with the test suite. The generated source and header files have also been removed from the main source list and placed in the CMake module as the global variables EMBEDDED_RESOURCE_SOURCES and EMBEDDED_RESOURCE_HEADERS.
2018-03-25 12:29:02 +00:00
)
Use Cmake to generate app-bundle on Mac - build the .plist using CMake features - update the nightly Mac packaging script for the new layout
2014-02-14 18:58:36 +00:00
Embedded resources: better cmake command Use add_custom_command and an intermediate OBJECT library to avoid rerunning fgrcc unless the XML input file has actually changed.
2020-08-21 11:13:10 +00:00
add_dependencies(fgfs buildId)
Fix CMake dependencies for translations When only building the fgfs target (which IDEs tend to do), we didn’t update the translations. Add an explicit dependency to remedy this.
2018-08-28 11:04:56 +00:00
# explicitly disable automoc for main fgfs target
set_property(TARGET fgfs PROPERTY AUTOMOC OFF)
Improved build.h generation (each build) Use a custom_target to recursively invoke Cmake at build time; this ensures the build ID and Git revision are always up to date.
2018-08-19 15:06:16 +00:00
Main: Formatting standardization for the src/Main/CMakeLists.txt file. This includes spacing, tab to space replacements, and alphabetical ordering.
2018-03-02 21:18:28 +00:00
# MacOSX bundle packaging
Use Cmake to generate app-bundle on Mac - build the .plist using CMake features - update the nightly Mac packaging script for the new layout
2014-02-14 18:58:36 +00:00
if(APPLE)
CMake: Shifted the Mac bundle commands into its own CMake module.
2018-03-25 16:51:10 +00:00
setup_fgfs_bundle(fgfs)
Use Cmake to generate app-bundle on Mac - build the .plist using CMake features - update the nightly Mac packaging script for the new layout
2014-02-14 18:58:36 +00:00
endif()
CMake: Split the target links and includes into separate CMake modules.
2018-03-26 20:27:25 +00:00
# Set up the target links.
CMake: Shifted the target setup code into its own CMake module. This is for simplifying the main src/Main/CMakeLists.txt file and allowing the code to be shared with the test suite.
2018-03-25 12:18:24 +00:00
setup_fgfs_libraries(fgfs)
Build changes for new crash-reporting system.
2020-04-07 08:38:13 +00:00
export_debug_symbols(fgfs)
Improve CMake strucutre
2020-08-19 13:49:50 +00:00
# Additional search paths for includes.
setup_fgfs_includes(fgfs)
Bring metar helper into CMake world, and use new HTTP code.
2011-10-21 11:48:42 +00:00
CMake: move install() rule for compatability Older CMake versions can’t install(TARGET…) from a different directory.
2020-08-23 20:50:36 +00:00
# this has to live here for compatability with older CMake versions
if (APPLE)
install(TARGETS fgfs BUNDLE DESTINATION .)
else()
install(TARGETS fgfs RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
Make compiling of all utils/tools optional
2013-02-12 16:38:46 +00:00
if(ENABLE_METAR)
add_executable(metar metar_main.cxx)
Improve CMake strucutre
2020-08-19 13:49:50 +00:00
target_link_libraries(metar SimGearScene)
Use CMAKE_INSTALL_BINDIR Allow /bin install directory to be overriden. Debian for example uses this to install FlightGear to /usr/games/ instead of /usr/bin/ https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
2016-07-09 21:14:28 +00:00
install(TARGETS metar RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
Make compiling of all utils/tools optional
2013-02-12 16:38:46 +00:00
endif()
Unit-test for initPosition. Only basic, but can be expanded incrementally now
2017-03-27 14:37:54 +00:00
Switch to using OBJECT library for main build Allows sharing object files between the fgfs and test_suite targets, in a follow-up commit.
2021-03-08 15:53:53 +00:00
# ensure run/debug paths are set automatically in Visual Studio
Improve MSVC project generation - set startup project to fgfs - guess a value for PATH based on the build config
2018-06-16 12:03:23 +00:00
if (MSVC)
Move Qt root path variable to top-level CMakeList
2020-06-10 16:59:09 +00:00
file(TO_NATIVE_PATH "${FG_QT_BIN_DIR}" _qt5_bin_dir_native)
CMake: overhaul how we find 3rd-party files Handle the standard windows-3rd-party setup (used by fgmeta) with no extra options, and also handle the slightly odd setup we use on Jenkins. Try to tolerate all permutations of setting MSVC_3RDPARTY_ROOT to different places in the hierarchy. We no longer try to guess Boost_INCLUDEDIR by looking at parent dirs of MSVC_3RDPARTY_ROOT, since this seemed kind of bad to me. Let’s try it and see.
2020-08-26 12:57:24 +00:00
file(TO_NATIVE_PATH "${FINAL_MSVC_3RDPARTY_DIR}/bin" _msvc_3rdparty_bin_dir)
Improve MSVC project generation - set startup project to fgfs - guess a value for PATH based on the build config
2018-06-16 12:03:23 +00:00
file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" _install_bin_dir)
set_property(TARGET fgfs PROPERTY
VS_GLOBAL_LocalDebuggerEnvironment "PATH=${_install_bin_dir};${_msvc_3rdparty_bin_dir};${_qt5_bin_dir_native}")
Switch to using OBJECT library for main build Allows sharing object files between the fgfs and test_suite targets, in a follow-up commit.
2021-03-08 15:53:53 +00:00
endif()
Copy permalink