len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 13:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rbutil: Qt6 fixes.

Browse source 
Change-Id: Ied6bdf1c5269b53ccfedc1d80f3f3f0d6b4011da
This commit is contained in:
Dominik Riebeling 2022-03-23 19:28:55 +01:00
parent 948637c42c
commit 00ec195c26
4 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
utils/CMakeLists.txt
View file

@ -48,13 +48,15 @@ enable_testing()
# Qt
find_package(QT NAMES Qt6 Qt5 REQUIRED)
if(QT_VERSION_MAJOR EQUAL 5)
find_package(Qt5 COMPONENTS Core Widgets Svg Multimedia Network Test LinguistTools REQUIRED)
find_package(Qt5 REQUIRED COMPONENTS
Core Widgets Svg Multimedia Network Test LinguistTools)
else()
find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat Widgets Svg Multimedia Network LinguistTools
find_package(Qt6 REQUIRED COMPONENTS
Core Core5Compat Widgets Svg Multimedia Network LinguistTools SvgWidgets
OPTIONAL_COMPONENTS Test)
endif()
get_target_property(_qmake_executable Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION)
get_filename_component(QT_BINDIR "${_qmake_executable}" DIRECTORY)
get_target_property(_moc_executable Qt${QT_VERSION_MAJOR}::moc IMPORTED_LOCATION)
get_filename_component(QT_BINDIR "${_moc_executable}" DIRECTORY)
message("-- Found Qt${QT_VERSION_MAJOR}: ${Qt${QT_VERSION_MAJOR}_DIR}")
# If we're on Linux, try to find the used libs in the system.