Skip to content

Commit 668f21c

Browse files
Merge pull request #825 from laurynas-biveinis/gcc-15-partial
Add GCC 15 warning support
2 parents d2e8b06 + a748522 commit 668f21c

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

.github/workflows/old-compilers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ jobs:
777777
run: |
778778
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
779779
sudo apt-get update
780-
sudo apt-get install -y g++-13
780+
sudo apt-get install -y "g++-${VERSION}"
781781
if: env.COMPILER == 'gcc' && env.VERSION == '13'
782782

783783
- name: Configure CMake

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ set(GCC_GE_11_CXX_WARNING_FLAGS
119119
set(GCC_GE_12_CXX_WARNING_FLAGS "-Winterference-size")
120120
set(GCC_GE_14_CXX_WARNING_FLAGS "-Wnrvo" "-Welaborated-enum-base"
121121
"-Wdangling-reference")
122+
set(GCC_GE_15_CXX_WARNING_FLAGS "-Wleading-whitespace=spaces"
123+
"-Wtrailing-whitespace=any")
122124

123125
set(UNIX_CXX_FLAGS "-g")
124126

@@ -411,6 +413,7 @@ set(cxx_ge_12 "$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,12.0>")
411413
set(cxx_lt_13 "$<VERSION_LESS:$<CXX_COMPILER_VERSION>,13.0>")
412414
set(cxx_ge_13 "$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,13.0>")
413415
set(cxx_ge_14 "$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,14.0>")
416+
set(cxx_ge_15 "$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,15.0>")
414417
set(cxx_ge_21 "$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,21.0>")
415418
set(is_clang_lt_13_not_windows "$<AND:${is_clang_not_windows},${cxx_lt_13}>")
416419
set(is_clang_ge_13_not_windows "$<AND:${is_clang_not_windows},${cxx_ge_13}>")
@@ -421,6 +424,7 @@ set(is_darwin_clang_ge_21_arm64 "$<AND:$<PLATFORM_ID:Darwin>,${is_clang_ge_21_no
421424
set(is_gxx_ge_11 "$<AND:${is_gxx_genex},${cxx_ge_11}>")
422425
set(is_gxx_ge_12 "$<AND:${is_gxx_genex},${cxx_ge_12}>")
423426
set(is_gxx_ge_14 "$<AND:${is_gxx_genex},${cxx_ge_14}>")
427+
set(is_gxx_ge_15 "$<AND:${is_gxx_genex},${cxx_ge_15}>")
424428
# Configuration
425429
set(has_avx2 "$<BOOL:${AVX2}>")
426430
set(use_boost_stacktrace "$<BOOL:${USE_BOOST_STACKTRACE}>")
@@ -733,6 +737,7 @@ function(COMMON_TARGET_PROPERTIES TARGET)
733737
"$<$<AND:${is_standalone},${is_gxx_ge_11}>:${GCC_GE_11_CXX_WARNING_FLAGS}>"
734738
"$<$<AND:${is_standalone},${is_gxx_ge_12}>:${GCC_GE_12_CXX_WARNING_FLAGS}>"
735739
"$<$<AND:${is_standalone},${is_gxx_ge_14}>:${GCC_GE_14_CXX_WARNING_FLAGS}>"
740+
"$<$<AND:${is_standalone},${is_gxx_ge_15}>:${GCC_GE_15_CXX_WARNING_FLAGS}>"
736741
# Optimization
737742
"$<${is_not_release_genex}:$<IF:${is_windows_genex},/Od,-O0>>"
738743
"$<$<AND:${is_release_genex},${is_not_windows}>:$<IF:${coverage_on},-O0,-O3>>"

0 commit comments

Comments
 (0)