diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-10 10:44:24 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-05-12 07:17:54 -0400 |
| commit | 89478e643f42bfdf0ace9f83416536bea9f23fab (patch) | |
| tree | cf98e148b37aeec97c3cf478e78510f652e01e02 /.gitlab/ci | |
| parent | 6ff48b862c0f24f9ad9f89c8c3511f22a8a54e9d (diff) | |
| download | cmake-89478e643f42bfdf0ace9f83416536bea9f23fab.tar.gz | |
gitlab-ci: update to Fedora 34 base images
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/configure_fedora33_tidy.cmake | 3 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora34_common.cmake (renamed from .gitlab/ci/configure_fedora33_common.cmake) | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora34_makefiles.cmake (renamed from .gitlab/ci/configure_fedora33_makefiles.cmake) | 0 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora34_ninja.cmake (renamed from .gitlab/ci/configure_fedora33_ninja.cmake) | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora34_ninja_multi.cmake (renamed from .gitlab/ci/configure_fedora33_ninja_multi.cmake) | 0 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora34_sphinx.cmake (renamed from .gitlab/ci/configure_fedora33_sphinx.cmake) | 0 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora34_sphinx_package.cmake (renamed from .gitlab/ci/configure_fedora33_sphinx_package.cmake) | 0 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora34_tidy.cmake | 3 | ||||
| -rw-r--r-- | .gitlab/ci/env_fedora34_makefiles.cmake (renamed from .gitlab/ci/env_fedora33_makefiles.cmake) | 0 |
9 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab/ci/configure_fedora33_tidy.cmake b/.gitlab/ci/configure_fedora33_tidy.cmake deleted file mode 100644 index 9052fdc562..0000000000 --- a/.gitlab/ci/configure_fedora33_tidy.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") - -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake") diff --git a/.gitlab/ci/configure_fedora33_common.cmake b/.gitlab/ci/configure_fedora34_common.cmake index dee78abfe7..4484e264ff 100644 --- a/.gitlab/ci/configure_fedora33_common.cmake +++ b/.gitlab/ci/configure_fedora34_common.cmake @@ -1,5 +1,6 @@ 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_fedora33_makefiles.cmake b/.gitlab/ci/configure_fedora34_makefiles.cmake index 7519d95c1d..7519d95c1d 100644 --- a/.gitlab/ci/configure_fedora33_makefiles.cmake +++ b/.gitlab/ci/configure_fedora34_makefiles.cmake diff --git a/.gitlab/ci/configure_fedora33_ninja.cmake b/.gitlab/ci/configure_fedora34_ninja.cmake index 883f425e7b..37bc189dbc 100644 --- a/.gitlab/ci/configure_fedora33_ninja.cmake +++ b/.gitlab/ci/configure_fedora34_ninja.cmake @@ -4,4 +4,4 @@ set(CMake_TEST_GUI "ON" CACHE BOOL "") # Cover compilation with C++11 only and not higher standards. set(CMAKE_CXX_STANDARD "11" CACHE STRING "") -include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora33_common.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake") diff --git a/.gitlab/ci/configure_fedora33_ninja_multi.cmake b/.gitlab/ci/configure_fedora34_ninja_multi.cmake index efb4b846f4..efb4b846f4 100644 --- a/.gitlab/ci/configure_fedora33_ninja_multi.cmake +++ b/.gitlab/ci/configure_fedora34_ninja_multi.cmake diff --git a/.gitlab/ci/configure_fedora33_sphinx.cmake b/.gitlab/ci/configure_fedora34_sphinx.cmake index 90d159b739..90d159b739 100644 --- a/.gitlab/ci/configure_fedora33_sphinx.cmake +++ b/.gitlab/ci/configure_fedora34_sphinx.cmake diff --git a/.gitlab/ci/configure_fedora33_sphinx_package.cmake b/.gitlab/ci/configure_fedora34_sphinx_package.cmake index e839de80c2..e839de80c2 100644 --- a/.gitlab/ci/configure_fedora33_sphinx_package.cmake +++ b/.gitlab/ci/configure_fedora34_sphinx_package.cmake diff --git a/.gitlab/ci/configure_fedora34_tidy.cmake b/.gitlab/ci/configure_fedora34_tidy.cmake new file mode 100644 index 0000000000..9c79303dfe --- /dev/null +++ b/.gitlab/ci/configure_fedora34_tidy.cmake @@ -0,0 +1,3 @@ +set(CMake_RUN_CLANG_TIDY ON CACHE BOOL "") + +include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora34_common.cmake") diff --git a/.gitlab/ci/env_fedora33_makefiles.cmake b/.gitlab/ci/env_fedora34_makefiles.cmake index 1d0efa7d5a..1d0efa7d5a 100644 --- a/.gitlab/ci/env_fedora33_makefiles.cmake +++ b/.gitlab/ci/env_fedora34_makefiles.cmake |