summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-02-01 15:27:24 (GMT)
committerBrad King <brad.king@kitware.com>2022-02-01 15:27:24 (GMT)
commit68ab7b187cae9e63eb943f11909e5471f1662204 (patch)
treeb2993b46eb8a0fb784dda3d66f06eb93523cfbc8
parent79aa2c530ab3bd6a1aa759cade2c9dc32a008450 (diff)
parent45feab3c001766ac42115eeb0956b6ad170843f7 (diff)
downloadCMake-68ab7b187cae9e63eb943f11909e5471f1662204.zip
CMake-68ab7b187cae9e63eb943f11909e5471f1662204.tar.gz
CMake-68ab7b187cae9e63eb943f11909e5471f1662204.tar.bz2
Merge branch 'ci-assertions' into release-3.22
Merge-request: !6927
-rw-r--r--.gitlab/ci/configure_fedora34_ninja.cmake4
-rw-r--r--.gitlab/os-linux.yml1
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_fedora34_ninja.cmake b/.gitlab/ci/configure_fedora34_ninja.cmake
index 37bc189..629f792 100644
--- a/.gitlab/ci/configure_fedora34_ninja.cmake
+++ b/.gitlab/ci/configure_fedora34_ninja.cmake
@@ -1,6 +1,10 @@
set(CMake_TEST_ISPC "ON" CACHE STRING "")
set(CMake_TEST_GUI "ON" CACHE BOOL "")
+# "Release" flags without "-DNDEBUG" so we get assertions.
+set(CMAKE_C_FLAGS_RELEASE "-O3" CACHE STRING "")
+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 "")
diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index c831530..90c10a2 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -131,6 +131,7 @@
variables:
CMAKE_CONFIGURATION: fedora34_ninja
+ CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
.fedora34_ninja_multi: