sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(cmake/FindQsci.cmake): set QSCI_VER to Qt major version instead of 5

Browse Source 
As it did not work with qt6
This commit is contained in:
bdm-oslandia 2023-10-20 17:04:02 +02:00 committed by Julien Cabieces
parent 9ff43c4f3c
commit a66406f52b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -460,12 +460,14 @@ if(WITH_CORE)
set (BUILD_WITH_QT6 FALSE CACHE BOOL "Enable (experimental) Qt6 support")
if (BUILD_WITH_QT6)
set(QT_VERSION_MAJOR 6)
set(QT_MIN_VERSION 6.4.0)
set(QT_VERSION_BASE "Qt6")
set(QT_VERSION_BASE_LOWER "qt6")
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
else()
set(QT_VERSION_MAJOR 5)
set(QT_MIN_VERSION 5.14.0)
set(QT_VERSION_BASE "Qt5")
set(QT_VERSION_BASE_LOWER "qt5")

2
cmake/FindQsci.cmake
View File

@ -42,7 +42,7 @@ ELSE(QSCI_MOD_VERSION_STR)
FIND_FILE(_find_qsci_py FindQsci.py PATHS ${CMAKE_MODULE_PATH} NO_CMAKE_FIND_ROOT_PATH)
SET(QSCI_VER 5)
SET(QSCI_VER ${QT_VERSION_MAJOR})
EXECUTE_PROCESS(COMMAND ${Python_EXECUTABLE} ${_find_qsci_py} ${QSCI_VER} OUTPUT_VARIABLE qsci_ver)