Browse Source

Merge branch 'ci-assertions' into release-3.22

Merge-request: !6927
Brad King 3 years ago
parent
commit
68ab7b187c
2 changed files with 5 additions and 0 deletions
  1. 4 0
      .gitlab/ci/configure_fedora34_ninja.cmake
  2. 1 0
      .gitlab/os-linux.yml

+ 4 - 0
.gitlab/ci/configure_fedora34_ninja.cmake

@@ -1,6 +1,10 @@
 set(CMake_TEST_ISPC "ON" CACHE STRING "")
 set(CMake_TEST_ISPC "ON" CACHE STRING "")
 set(CMake_TEST_GUI "ON" CACHE BOOL "")
 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.
 # Cover compilation with C++11 only and not higher standards.
 set(CMAKE_CXX_STANDARD "11" CACHE STRING "")
 set(CMAKE_CXX_STANDARD "11" CACHE STRING "")
 
 

+ 1 - 0
.gitlab/os-linux.yml

@@ -131,6 +131,7 @@
 
 
     variables:
     variables:
         CMAKE_CONFIGURATION: fedora34_ninja
         CMAKE_CONFIGURATION: fedora34_ninja
+        CMAKE_CI_BUILD_TYPE: Release
         CTEST_NO_WARNINGS_ALLOWED: 1
         CTEST_NO_WARNINGS_ALLOWED: 1
 
 
 .fedora34_ninja_multi:
 .fedora34_ninja_multi: