diff options
| author | Brad King <brad.king@kitware.com> | 2022-03-02 13:56:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-03-02 14:47:02 (GMT) |
| commit | ac37e99453f21b57fcd09cc037a7925a7bc017f3 (patch) | |
| tree | a40360cf6ab6c4914686f83b8c75e3db41207ffc /.gitlab | |
| parent | 020920e8b5cbbff14323a29d5f7ff51ba2e3cb83 (diff) | |
| download | CMake-ac37e99453f21b57fcd09cc037a7925a7bc017f3.zip CMake-ac37e99453f21b57fcd09cc037a7925a7bc017f3.tar.gz CMake-ac37e99453f21b57fcd09cc037a7925a7bc017f3.tar.bz2 | |
ci: Rename variable CMake_SKIP_INSTALL to CMAKE_CI_NO_INSTALL
The latter follows our convention for other variable names.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/ctest_build.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 8 | ||||
| -rw-r--r-- | .gitlab/os-macos.yml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab/ci/ctest_build.cmake b/.gitlab/ci/ctest_build.cmake index e7a0985..4bb2924 100644 --- a/.gitlab/ci/ctest_build.cmake +++ b/.gitlab/ci/ctest_build.cmake @@ -37,7 +37,7 @@ if ("$ENV{CTEST_NO_WARNINGS_ALLOWED}" AND num_warnings GREATER 0) "Found ${num_warnings} warnings (treating as fatal).") endif () -if (NOT "$ENV{CMake_SKIP_INSTALL}") +if (NOT "$ENV{CMAKE_CI_NO_INSTALL}") ctest_build(APPEND TARGET install RETURN_VALUE install_result) diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index f53f6f9..07aa624 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -57,7 +57,7 @@ variables: CMAKE_CONFIGURATION: debian10_iwyu CTEST_NO_WARNINGS_ALLOWED: 1 - CMake_SKIP_INSTALL: 1 + CMAKE_CI_NO_INSTALL: 1 .debian10_aarch64: image: "kitware/cmake:ci-debian10-aarch64-2022-02-21" @@ -83,7 +83,7 @@ variables: CMAKE_CONFIGURATION: fedora35_tidy CTEST_NO_WARNINGS_ALLOWED: 1 - CMake_SKIP_INSTALL: 1 + CMAKE_CI_NO_INSTALL: 1 .fedora35_clang_analyzer: extends: .fedora35 @@ -92,7 +92,7 @@ CMAKE_CONFIGURATION: fedora35_clang_analyzer CMAKE_CI_BUILD_TYPE: Debug CTEST_NO_WARNINGS_ALLOWED: 1 - CMake_SKIP_INSTALL: 1 + CMAKE_CI_NO_INSTALL: 1 .fedora35_sphinx: extends: .fedora35 @@ -101,7 +101,7 @@ CMAKE_CONFIGURATION: fedora35_sphinx CTEST_NO_WARNINGS_ALLOWED: 1 CTEST_SOURCE_SUBDIRECTORY: "Utilities/Sphinx" - CMake_SKIP_INSTALL: 1 + CMAKE_CI_NO_INSTALL: 1 .fedora35_sphinx_package: extends: .fedora35 diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml index b0844cb..79e2e25 100644 --- a/.gitlab/os-macos.yml +++ b/.gitlab/os-macos.yml @@ -52,7 +52,7 @@ variables: CMAKE_CONFIGURATION: macos_package CTEST_NO_WARNINGS_ALLOWED: 1 - CMake_SKIP_INSTALL: 1 + CMAKE_CI_NO_INSTALL: 1 .macos10.10_package: extends: .macos_build @@ -60,7 +60,7 @@ variables: CMAKE_CONFIGURATION: macos10.10_package CTEST_NO_WARNINGS_ALLOWED: 1 - CMake_SKIP_INSTALL: 1 + CMAKE_CI_NO_INSTALL: 1 ### External testing |