blob: 88770dc384d807e55d4ebc5bc10403144aff08ca (
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
|
diff -ruN quarter/CMakeLists.txt my/CMakeLists.txt
--- quarter/CMakeLists.txt 2024-02-05 00:29:17.000000000 +0100
+++ my/CMakeLists.txt 2024-02-29 02:46:06.768299838 +0100
@@ -96,17 +96,17 @@
if(QUARTER_USE_QT6)
if(QUARTER_BUILD_PLUGIN)
- find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets Designer QUIET)
+ find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets Designer REQUIRED)
else()
- find_package(Qt6 COMPONENTS Widgets UiTools OpenGL OpenGLWidgets QUIET)
+ find_package(Qt6 COMPONENTS Widgets OpenGL OpenGLWidgets REQUIRED)
endif()
endif()
if(NOT Qt6_FOUND AND QUARTER_USE_QT5)
if(QUARTER_BUILD_PLUGIN)
- find_package(Qt5 COMPONENTS Widgets UiTools OpenGL Designer QUIET)
+ find_package(Qt5 COMPONENTS Widgets UiTools OpenGL Designer REQUIRED)
else()
- find_package(Qt5 COMPONENTS Widgets UiTools OpenGL QUIET)
+ find_package(Qt5 COMPONENTS Widgets OpenGL REQUIRED)
endif()
endif()
@@ -116,14 +116,14 @@
endif()
if(Qt6_FOUND)
- set(QUARTER_QT_TARGETS Qt6::Widgets Qt6::UiTools Qt6::OpenGL Qt6::OpenGLWidgets)
+ set(QUARTER_QT_TARGETS Qt6::Widgets Qt6::OpenGL Qt6::OpenGLWidgets)
set(QUARTER_PLUGIN_QT_TARGETS Qt6::Designer)
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${Qt6Core_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${Qt6Core_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${Qt6Core_VERSION_STRING}")
set(QUARTER_PKG_DEPS "${QUARTER_PKG_DEPS} Qt6Widgets Qt6UiTools Qt6OpenGL Qt6OpenGLWidgets Qt6Designer")
elseif(Qt5_FOUND)
- set(QUARTER_QT_TARGETS Qt5::Widgets Qt5::UiTools Qt5::OpenGL)
+ set(QUARTER_QT_TARGETS Qt5::Widgets Qt5::OpenGL)
set(QUARTER_PLUGIN_QT_TARGETS Qt5::Designer)
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${Qt5Core_VERSION_STRING}")
string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${Qt5Core_VERSION_STRING}")
|
GitWeb
