From 5afbc739dc91ffeaca2ff2dfe47c873f583f5cb5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 21 Feb 2025 11:31:26 -0500 Subject: [PATCH] ci: Specify Qt version separately for each Fedora build Currently all builds use Qt 5. Prepare to switch some to Qt 6. --- .gitlab/ci/configure_fedora41_asan.cmake | 1 + .gitlab/ci/configure_fedora41_clang_analyzer.cmake | 1 + .gitlab/ci/configure_fedora41_common.cmake | 1 - .gitlab/ci/configure_fedora41_makefiles_symlinked.cmake | 1 + .gitlab/ci/configure_fedora41_ninja.cmake | 2 ++ .gitlab/ci/configure_fedora41_tidy.cmake | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/configure_fedora41_asan.cmake b/.gitlab/ci/configure_fedora41_asan.cmake index df9f46d3cb..4441792ea6 100644 --- a/.gitlab/ci/configure_fedora41_asan.cmake +++ b/.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") diff --git a/.gitlab/ci/configure_fedora41_clang_analyzer.cmake b/.gitlab/ci/configure_fedora41_clang_analyzer.cmake index cdeaab43a1..4a518d0f3b 100644 --- a/.gitlab/ci/configure_fedora41_clang_analyzer.cmake +++ b/.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") diff --git a/.gitlab/ci/configure_fedora41_common.cmake b/.gitlab/ci/configure_fedora41_common.cmake index 4484e264ff..dee78abfe7 100644 --- a/.gitlab/ci/configure_fedora41_common.cmake +++ b/.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 "") diff --git a/.gitlab/ci/configure_fedora41_makefiles_symlinked.cmake b/.gitlab/ci/configure_fedora41_makefiles_symlinked.cmake index e4434c125e..6dd27f8976 100644 --- a/.gitlab/ci/configure_fedora41_makefiles_symlinked.cmake +++ b/.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") diff --git a/.gitlab/ci/configure_fedora41_ninja.cmake b/.gitlab/ci/configure_fedora41_ninja.cmake index 217d24aa75..9bef7e802f 100644 --- a/.gitlab/ci/configure_fedora41_ninja.cmake +++ b/.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") diff --git a/.gitlab/ci/configure_fedora41_tidy.cmake b/.gitlab/ci/configure_fedora41_tidy.cmake index 40bde10c56..664b4f1e77 100644 --- a/.gitlab/ci/configure_fedora41_tidy.cmake +++ b/.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")