Browse Source

ci: Specify Qt version separately for each Fedora build

Currently all builds use Qt 5.  Prepare to switch some to Qt 6.
Brad King 9 months ago
parent
commit
5afbc739dc

+ 1 - 0
.gitlab/ci/configure_fedora41_asan.cmake

@@ -1,4 +1,5 @@
 set(CMAKE_C_FLAGS "-fsanitize=address" CACHE STRING "")
 set(CMAKE_CXX_FLAGS "-fsanitize=address" CACHE STRING "")
+set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake")

+ 1 - 0
.gitlab/ci/configure_fedora41_clang_analyzer.cmake

@@ -1,3 +1,4 @@
 set(configure_no_sccache 1)
+set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake")

+ 0 - 1
.gitlab/ci/configure_fedora41_common.cmake

@@ -1,6 +1,5 @@
 set(BUILD_CursesDialog ON CACHE BOOL "")
 set(BUILD_QtDialog ON CACHE BOOL "")
-set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
 set(CMake_TEST_JQ "/usr/bin/jq" CACHE PATH "")
 set(CMake_TEST_JSON_SCHEMA ON CACHE BOOL "")
 

+ 1 - 0
.gitlab/ci/configure_fedora41_makefiles_symlinked.cmake

@@ -1,2 +1,3 @@
+set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
 include("${CMAKE_CURRENT_LIST_DIR}/configure_symlinked_common.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake")

+ 2 - 0
.gitlab/ci/configure_fedora41_ninja.cmake

@@ -14,5 +14,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3" CACHE STRING "")
 
 # Cover compilation with C++11 only and not higher standards.
 set(CMAKE_CXX_STANDARD "11" CACHE STRING "")
+# Qt 6 requires C++17, so use Qt 5.
+set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake")

+ 1 - 0
.gitlab/ci/configure_fedora41_tidy.cmake

@@ -2,5 +2,6 @@ set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "")
 set(CMake_USE_CLANG_TIDY_MODULE ON CACHE BOOL "")
 set(CMake_CLANG_TIDY_MODULE "$ENV{CI_PROJECT_DIR}/Utilities/ClangTidyModule/build/libcmake-clang-tidy-module.so" CACHE FILEPATH "")
 set(CMake_CLANG_TIDY_EXPORT_FIXES_DIR "$ENV{CI_PROJECT_DIR}/.gitlab/clang-tidy-fixes" CACHE PATH "")
+set(CMake_QT_MAJOR_VERSION "5" CACHE STRING "")
 
 include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora41_common.cmake")