From 3bae894f189656eb659d86eee7110b5f1f9aef50 Mon Sep 17 00:00:00 2001 From: Alexander Kavon Date: Thu, 18 Jan 2024 20:30:44 -0500 Subject: [PATCH] use natural sorting to choose the highest version found if not specified --- cmake/QskFindMacros.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/QskFindMacros.cmake b/cmake/QskFindMacros.cmake index f2791254..331f53e4 100644 --- a/cmake/QskFindMacros.cmake +++ b/cmake/QskFindMacros.cmake @@ -5,7 +5,12 @@ macro(qsk_setup_Qt) - # relying on cmake heuristics to select a specific Qt version is no good idea. + # set vars for correct natural sort order and direction (ex. Qt6, Qt5) + # cmake bug: https://gitlab.kitware.com/cmake/cmake/-/issues/23575 + if (NOT CMAKE_FIND_PACKAGE_SORT_ORDER AND NOT CMAKE_FIND_PACKAGE_SORT_DIRECTION) + set(CMAKE_FIND_PACKAGE_SORT_ORDER NATURAL) + set(CMAKE_FIND_PACKAGE_SORT_DIRECTION DEC) + endif() # using -DCMAKE_PREFIX_PATH="..." is highly recommended find_package(QT "5.15" NAMES Qt6 Qt5 REQUIRED COMPONENTS Quick)