summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch')
-rw-r--r--games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch b/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
new file mode 100644
index 000000000000..0af961beacdf
--- /dev/null
+++ b/games-simulation/flightgear/files/flightgear-2020.3.5-cmake.patch
@@ -0,0 +1,45 @@
+diff -ruN flightgear-2020.3.5/CMakeLists.txt fgfs-my/CMakeLists.txt
+--- flightgear-2020.3.5/CMakeLists.txt 2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/CMakeLists.txt 2021-01-24 01:36:57.547695230 +0100
+@@ -373,7 +373,7 @@
+ ## Qt5 setup setup
+ if (ENABLE_QT)
+ message(STATUS "Qt launcher enabled, checking for Qt >= 5.4 / qmake")
+- find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick Svg)
++ find_package(Qt5 5.4 COMPONENTS Widgets Gui Network Qml Quick)
+ if (Qt5Widgets_FOUND)
+ message(STATUS "Will enable Qt launcher GUI")
+ set(HAVE_QT 1)
+diff -ruN flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
+--- flightgear-2020.3.5/CMakeModules/SetupFGFSLibraries.cmake 2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake 2021-01-24 01:35:31.298263659 +0100
+@@ -33,15 +33,8 @@
+
+ # PkgConfig::DBUS target
+
+- if(CMAKE_VERSION VERSION_LESS 3.6)
+- if(DBUS_FOUND)
+- target_link_libraries(${target} ${DBUS_LDFLAGS})
+- endif()
+- else()
+- # PkgConfig::DBUS target
+- if(TARGET PkgConfig::DBUS)
+- target_link_libraries(${target} PkgConfig::DBUS)
+- endif()
++ if(DBUS_FOUND)
++ target_link_libraries(${target} ${DBUS_LDFLAGS})
+ endif()
+
+ if(FG_HAVE_GPERFTOOLS)
+diff -ruN flightgear-2020.3.5/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
+--- flightgear-2020.3.5/src/GUI/CMakeLists.txt 2020-12-18 12:43:09.000000000 +0100
++++ fgfs-my/src/GUI/CMakeLists.txt 2021-01-24 01:40:02.008618256 +0100
+@@ -142,7 +142,7 @@
+
+ set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
+ target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
+- target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore)
++ target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick SimGearCore)
+
+ if (ENABLE_QQ_UI)
+ set(QQUI_SOURCES