diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-03-23 19:28:55 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2022-03-23 19:34:30 +0100 |
commit | 00ec195c262acd152537901bf9a5e881d6e40eb3 (patch) | |
tree | 413468682847e0d50a5f9c491e2b92b64fc87bc9 /utils/CMakeLists.txt | |
parent | 948637c42cb9feb228f26a603391be6343782b51 (diff) | |
download | rockbox-00ec195c262acd152537901bf9a5e881d6e40eb3.tar.gz rockbox-00ec195c262acd152537901bf9a5e881d6e40eb3.zip |
rbutil: Qt6 fixes.
Change-Id: Ied6bdf1c5269b53ccfedc1d80f3f3f0d6b4011da
Diffstat (limited to 'utils/CMakeLists.txt')
-rw-r--r-- | utils/CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index d874f083b5..fc122426a2 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt | |||
@@ -48,13 +48,15 @@ enable_testing() | |||
48 | # Qt | 48 | # Qt |
49 | find_package(QT NAMES Qt6 Qt5 REQUIRED) | 49 | find_package(QT NAMES Qt6 Qt5 REQUIRED) |
50 | if(QT_VERSION_MAJOR EQUAL 5) | 50 | if(QT_VERSION_MAJOR EQUAL 5) |
51 | find_package(Qt5 COMPONENTS Core Widgets Svg Multimedia Network Test LinguistTools REQUIRED) | 51 | find_package(Qt5 REQUIRED COMPONENTS |
52 | Core Widgets Svg Multimedia Network Test LinguistTools) | ||
52 | else() | 53 | else() |
53 | find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat Widgets Svg Multimedia Network LinguistTools | 54 | find_package(Qt6 REQUIRED COMPONENTS |
55 | Core Core5Compat Widgets Svg Multimedia Network LinguistTools SvgWidgets | ||
54 | OPTIONAL_COMPONENTS Test) | 56 | OPTIONAL_COMPONENTS Test) |
55 | endif() | 57 | endif() |
56 | get_target_property(_qmake_executable Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION) | 58 | get_target_property(_moc_executable Qt${QT_VERSION_MAJOR}::moc IMPORTED_LOCATION) |
57 | get_filename_component(QT_BINDIR "${_qmake_executable}" DIRECTORY) | 59 | get_filename_component(QT_BINDIR "${_moc_executable}" DIRECTORY) |
58 | message("-- Found Qt${QT_VERSION_MAJOR}: ${Qt${QT_VERSION_MAJOR}_DIR}") | 60 | message("-- Found Qt${QT_VERSION_MAJOR}: ${Qt${QT_VERSION_MAJOR}_DIR}") |
59 | 61 | ||
60 | # If we're on Linux, try to find the used libs in the system. | 62 | # If we're on Linux, try to find the used libs in the system. |