blob: f463c458b5a0e5c2673a1039396d5886866c45cf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
diff -ruN flightgear-2020.1.2/CMakeLists.txt fgfs-my/CMakeLists.txt
--- flightgear-2020.1.2/CMakeLists.txt 2020-05-24 17:14:48.000000000 +0200
+++ fgfs-my/CMakeLists.txt 2020-05-31 13:56:41.745941586 +0200
@@ -367,7 +367,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 Network Qml Quick Svg)
+ find_package(Qt5 5.4 COMPONENTS Widgets Network Qml Quick)
if (Qt5Widgets_FOUND)
message(STATUS "Will enable Qt launcher GUI")
set(HAVE_QT 1)
diff -ruN flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake fgfs-my/CMakeModules/SetupFGFSLibraries.cmake
--- flightgear-2020.1.2/CMakeModules/SetupFGFSLibraries.cmake 2020-05-24 17:14:48.000000000 +0200
+++ fgfs-my/CMakeModules/SetupFGFSLibraries.cmake 2020-05-31 13:55:33.484421108 +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.1.2/src/GUI/CMakeLists.txt fgfs-my/src/GUI/CMakeLists.txt
--- flightgear-2020.1.2/src/GUI/CMakeLists.txt 2020-05-24 17:14:48.000000000 +0200
+++ fgfs-my/src/GUI/CMakeLists.txt 2020-05-31 13:56:41.745941586 +0200
@@ -137,7 +137,7 @@
${qml_sources})
set_property(TARGET fglauncher PROPERTY AUTOMOC ON)
- 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)
target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI)
add_library(fgqmlui QQuickDrawable.cxx
|
GitWeb
