You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
2.0 KiB
46 lines
2.0 KiB
diff -ruN flightgear-2020.3.8/CMakeLists.txt fgfs-my/CMakeLists.txt
|
|
--- flightgear-2020.3.8/CMakeLists.txt 2021-03-24 15:35:40.000000000 +0100
|
|
+++ fgfs-my/CMakeLists.txt 2021-05-15 00:47:36.801503634 +0200
|
|
@@ -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 AND Qt5Quick_FOUND)
|
|
message(STATUS "Will enable Qt launcher GUI")
|
|
set(HAVE_QT 1)
|
|
diff -ruN flightgear-2020.3.8/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
|
|
--- flightgear-2020.3.8/CMakeModules/SetupFGFSLibraries.cmake 2021-03-24 15:35:40.000000000 +0100
|
|
+++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake 2021-05-15 00:47:36.801503634 +0200
|
|
@@ -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.8/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
|
|
--- flightgear-2020.3.8/src/GUI/CMakeLists.txt 2021-03-24 15:35:40.000000000 +0100
|
|
+++ fgfs-my/src/GUI/CMakeLists.txt 2021-05-15 00:47:36.801503634 +0200
|
|
@@ -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
|