From f5e669f93f2b3812bce7f16ceb733bbebf4e1af1 Mon Sep 17 00:00:00 2001 From: Vladyslav Usenko Date: Sun, 9 Jun 2019 18:49:03 +0000 Subject: [PATCH] Disable Debug symbols in CI to reduce the ccache size --- .gitlab-ci.yml | 12 ++++++------ CMakeLists.txt | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53a5491..feb1083 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,7 +94,7 @@ bionic-release-compile: only: - master variables: - CXX_MARCH: 'corei7-avx' + CXX_MARCH: 'sandybridge' DEB_DIR: deb_bionic artifacts: paths: @@ -109,7 +109,7 @@ xenial-release-compile: only: - master variables: - CXX_MARCH: 'corei7-avx' + CXX_MARCH: 'sandybridge' DEB_DIR: deb_xenial artifacts: paths: @@ -122,13 +122,13 @@ bionic-debug-compile: only: - master variables: - BUILD_TYPE: Debug + BUILD_TYPE: CiDebug bionic-relwithdebinfo-compile: <<: *prepare_docker_definition <<: *compile_test_package_definition variables: - BUILD_TYPE: RelWithDebInfo + BUILD_TYPE: CiRelWithDebInfo elcapitan-relwithdebinfo-compile: <<: *compile_test_definition @@ -136,7 +136,7 @@ elcapitan-relwithdebinfo-compile: only: - master variables: - BUILD_TYPE: RelWithDebInfo + BUILD_TYPE: CiRelWithDebInfo mojave-relwithdebinfo-compile: <<: *compile_test_definition @@ -144,7 +144,7 @@ mojave-relwithdebinfo-compile: only: - master variables: - BUILD_TYPE: RelWithDebInfo + BUILD_TYPE: CiRelWithDebInfo # check if clang-format would make any changes clang-format: diff --git a/CMakeLists.txt b/CMakeLists.txt index 80d3c80..bd0c15e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,8 @@ set(BASALT_PASSED_CXX_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DEIGEN_INITIALIZE_MATRICES_BY_NAN") # cmake default: "-g" set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DEIGEN_INITIALIZE_MATRICES_BY_NAN") # cmake default: "-O2 -g -DNDEBUG" set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG") # cmake default: "-O3 -DNDEBUG" +set(CMAKE_CXX_FLAGS_CIDEBUG "-O0 -DEIGEN_INITIALIZE_MATRICES_BY_NAN") # CI version with no debug symbols +set(CMAKE_CXX_FLAGS_CIRELWITHDEBINFO "-O3 -DEIGEN_INITIALIZE_MATRICES_BY_NAN") # CI version with no debug symbols # base set of compile flags set(BASALT_CXX_FLAGS "-Wall -Wextra -Werror -Wno-unused-parameter -ftemplate-backtrace-limit=0")