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

use CMAKE_PREFIX_PATH to specify Qt version for find_package() call

This commit is contained in:
Alexander Kavon 2024-01-18 19:14:55 -05:00
parent 3f9fa56ea2
commit 42230d5d0c
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmake/QskFindMacros.cmake
View File

@ -5,15 +5,12 @@
macro(qsk_setup_Qt) macro(qsk_setup_Qt)
# Use QSK_QT_VERSION specified with baseline 5.15 # find_package() sort order and direction bug
# otherwise fallback to latest known supported Qt version gte 5.15 # where Qt6 is not considered before Qt5
# set vars for correct alpha descending sort order and direction (ex. Qt6, Qt5) # bug link: https://gitlab.kitware.com/cmake/cmake/-/issues/23575
if ( NOT QSK_QT_VERSION ) # QSK_QT_VERSION=Qt5 set(CMAKE_FIND_PACKAGE_SORT_ORDER NAME)
set(QSK_QT_VERSION Qt6 Qt5) set(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC)
set(CMAKE_FIND_PACKAGE_SORT_ORDER NAME) find_package(QT "5.15" NAMES Qt6 Qt5 REQUIRED COMPONENTS Quick)
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

4
doc/tutorials/03-writing-your-first-application.asciidoc
View File

@ -27,11 +27,11 @@ $ cmake ../ && make # build
$ sudo make install # install $ sudo make install # install
.... ....
To target a specific Qt version simply pass the cmake build variable `QSK_QT_VERSION` during the build step: To target a specific Qt version simply pass the cmake build variable `CMAKE_PREFIX_PATH` during the build step:
[source,shell] [source,shell]
.... ....
$ cmake -DQSK_QT_VERSION=Qt5 ../ && make $ cmake -DCMAKE_PREFIX_PATH=/usr/local/Qt-6.7.0 ../ && make
.... ....
=== Compiling our first app === Compiling our first app