peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSK_QT_VERSION removed as CMAKE_PREFIX_PATH offers a more general

Browse Source 
solution for selecting a specific Qt version
This commit is contained in:
Uwe Rathmann 2024-01-17 11:47:21 +01:00
parent 683088539f
commit 530720beb3
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/QskFindMacros.cmake
View File

@ -5,15 +5,9 @@
macro(qsk_setup_Qt) macro(qsk_setup_Qt)
# Use QSK_QT_VERSION specified with baseline 5.15 # relying on cmake heuristics to select a specific Qt version is no good idea.
# otherwise fallback to latest known supported Qt version gte 5.15 # using -DCMAKE_PREFIX_PATH="..." is highly recommended
# set vars for correct alpha descending sort order and direction (ex. Qt6, Qt5) find_package(QT "5.15" NAMES Qt6 Qt5 REQUIRED COMPONENTS Quick)
if ( NOT QSK_QT_VERSION ) # QSK_QT_VERSION=Qt5
set(QSK_QT_VERSION Qt6 Qt5)
set(CMAKE_FIND_PACKAGE_SORT_ORDER NAME)
set(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
endif()
find_package(QT "5.15" NAMES ${QSK_QT_VERSION} REQUIRED COMPONENTS Quick)
if(QT_VERSION_MAJOR VERSION_GREATER_EQUAL 6) if(QT_VERSION_MAJOR VERSION_GREATER_EQUAL 6)
# we need the qsb tool for Qt6 # we need the qsb tool for Qt6