diff --git a/CMakeLists.txt b/CMakeLists.txt index 681c37c92..7d76ceae8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ set(minRecGCCVersion 10.2) set(minRecClangVersion 12) set(minReqClangClVersion 14.0.3) # Packages -set(minQtVersion 6.2) +set(minReqQtVersion 6.2) # Unused # As the range-v3 uses exact version policy in the package config file so passing version # makes real problems on CI pipelines where different OS images can have installed @@ -398,7 +398,7 @@ tiny_resource_and_manifest(${TinyOrm_target} # Leaving this find_package(QT NAMES) search pattern even if the Qt v5 support was removed # because I like it and can be used with future Qt version find_package(QT NAMES Qt6 REQUIRED COMPONENTS ${TinyQtComponentsRequired}) -tiny_find_package(Qt${QT_VERSION_MAJOR} ${minQtVersion} CONFIG +tiny_find_package(Qt${QT_VERSION_MAJOR} ${minReqQtVersion} CONFIG REQUIRED COMPONENTS ${TinyQtComponentsRequired} ) tiny_find_package(range-v3 CONFIG REQUIRED) @@ -460,7 +460,7 @@ endif() if(BUILD_TESTS) enable_testing() - find_package(Qt${QT_VERSION_MAJOR} ${minQtVersion} REQUIRED COMPONENTS Test) + find_package(Qt${QT_VERSION_MAJOR} ${minReqQtVersion} REQUIRED COMPONENTS Test) add_subdirectory(tests) endif() diff --git a/drivers/common/CMakeLists.txt b/drivers/common/CMakeLists.txt index 1becd1653..8553b0390 100644 --- a/drivers/common/CMakeLists.txt +++ b/drivers/common/CMakeLists.txt @@ -198,7 +198,7 @@ if(QT_VERSION_MAJOR LESS 6) message(FATAL_ERROR "TinyDrivers library is not supported with Qt version <6.") endif() # No need to call the tiny_find_package() here as the core TinyOrm always depends on it -find_package(Qt${QT_VERSION_MAJOR} ${minQtVersion} CONFIG +find_package(Qt${QT_VERSION_MAJOR} ${minReqQtVersion} CONFIG REQUIRED COMPONENTS Core ) diff --git a/drivers/mysql/CMakeLists.txt b/drivers/mysql/CMakeLists.txt index c528886d3..461234303 100644 --- a/drivers/mysql/CMakeLists.txt +++ b/drivers/mysql/CMakeLists.txt @@ -156,7 +156,7 @@ if(QT_VERSION_MAJOR LESS 6) message(FATAL_ERROR "TinyMySql library is not supported with Qt version <6.") endif() # No need to call the tiny_find_package() here as the core TinyOrm always depends on it -find_package(Qt${QT_VERSION_MAJOR} ${minQtVersion} CONFIG +find_package(Qt${QT_VERSION_MAJOR} ${minReqQtVersion} CONFIG REQUIRED COMPONENTS Core ) tiny_find_package(MySQL REQUIRED)