Skip to content

Commit

Permalink
cmake renamed to minReqQtVersion
Browse files Browse the repository at this point in the history
Renamed CMake variable for minimum required Qt version
to minReqQtVersion (v6.2 is minimum).
  • Loading branch information
silverqx committed Jun 30, 2024
1 parent d1e8a1a commit 9623bbc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion drivers/common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion drivers/mysql/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 9623bbc

Please sign in to comment.