blob: ec0be2fa26eb29f3ff7c0b999f7e768c00d45a8d (
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
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7c7f509..2f2265a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,10 +81,11 @@ set(GZ_TOOLS_VER 2)
#--------------------------------------
# Find QT
-set(QT_MAJOR_VERSION 5)
-set(QT_MINOR_VERSION 15)
-gz_find_package (Qt${QT_MAJOR_VERSION}
- VERSION ${QT_MAJOR_VERSION}.${QT_MINOR_VERSION}
+set(qt_pkgconfig "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets")
+if(WIN32 OR APPLE)
+set(qt_pkgconfig "")
+endif()
+gz_find_package (Qt5
COMPONENTS
Core
Quick
@@ -92,8 +93,7 @@ gz_find_package (Qt${QT_MAJOR_VERSION}
Widgets
Test
REQUIRED
- PKGCONFIG_VER_COMPARISON >=
- PKGCONFIG "Qt${QT_MAJOR_VERSION}Core Qt${QT_MAJOR_VERSION}Quick Qt${QT_MAJOR_VERSION}QuickControls2 Qt${QT_MAJOR_VERSION}Widgets")
+ PKGCONFIG ${qt_pkgconfig})
add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x050F00)
set(GZ_GUI_PLUGIN_RELATIVE_INSTALL_DIR
|
