Skip to content

Commit 064c94a

Browse files
committed
Reduce Linux build verbosity and add CMake option for GCC min heapsize
1 parent 896d40e commit 064c94a

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ test-x64-windows-debug:
105105
- rm -rf "$CI_PROJECT_DIR/build/$TARGET_PLATFORM"
106106
- mkdir -p "$CI_PROJECT_DIR/build/$TARGET_PLATFORM"
107107
- cd "$CI_PROJECT_DIR/build/$TARGET_PLATFORM"
108-
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPDALC_ENABLE_CODE_COVERAGE=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_RULE_MESSAGES:BOOL=OFF "$CI_PROJECT_DIR"
109-
- make -j1 --no-print-directory
108+
- cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPDALC_ENABLE_CODE_COVERAGE=OFF -DPDALC_GCC_PARAM_GGC_MIN_HEAPSIZE=8192 "$CI_PROJECT_DIR"
109+
- make
110110
- make install
111111
variables:
112112
GIT_STRATEGY: clone

CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "CMake debug suffix")
2222
set(CMAKE_RELWITHDEBINFO_POSTFIX "" CACHE STRING "CMake RelWithDebInfo suffix")
2323

2424
set(PDALC_ENABLE_CODE_COVERAGE ON CACHE BOOL "Enable code coverage calculation")
25+
set(PDALC_GCC_PARAM_GGC_MIN_HEAPSIZE "131072" CACHE STRING "GCC garbage collection minimum heap size")
2526

2627
include_directories("${CMAKE_SOURCE_DIR}/source")
2728

2829
if(CMAKE_COMPILER_IS_GNUCXX)
29-
add_compile_options(-Wall)
30-
add_compile_options(--param ggc-min-heapsize=8192)
31-
add_definitions(-v)
30+
add_compile_options(--param ggc-min-heapsize=${PDALC_GCC_PARAM_GGC_MIN_HEAPSIZE})
3231

3332
if(PDALC_ENABLE_CODE_COVERAGE)
3433
message(STATUS "Enabled code coverage analysis")

0 commit comments

Comments
 (0)