fly/flightgear
1
0
Fork 0
Code Activity
flightgear/CMakeModules/SetupFGFSEmbeddedResources.cmake

12 lines
373 B
CMake
Raw Normal View History

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
function(setup_fgfs_embedded_resources)
# On Windows, make sure fgrcc can be run (it needs third-party libraries)
if(MSVC)
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
if (FINAL_MSVC_3RDPARTY_DIR)
set(CMAKE_MSVCIDE_RUN_PATH ${FINAL_MSVC_3RDPARTY_DIR}/bin PARENT_SCOPE)
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
else()
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
message(FATAL_ERROR "FINAL_MSVC_3RDPARTY_DIR is empty or unset")
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
endif()
endif()
endfunction()
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
Copy permalink