Skip to content

Commit b66745d

Browse files
committed
Fix typo
Fix windows clang build
1 parent c2335b4 commit b66745d

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175
if: matrix.compiler == 'clang' && matrix.config == 'Debug'
176176
uses: actions/upload-artifact@v4
177177
with:
178-
name: coverage-linux,${{matrix.compiler}}-${{matrix.version}}
178+
name: coverage-linux.${{matrix.compiler}}-${{matrix.version}}
179179
path: |
180180
${{runner.workspace}}/build/tests/coverage.${{matrix.compiler}}-${{matrix.version}}.txt
181181
${{runner.workspace}}/build/tests/coverage.overview.${{matrix.compiler}}-${{matrix.version}}.txt

cmake/clang_warnings.cmake

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ set(WARNING_FLAGS_VERSION16
4747
-Wno-unsafe-buffer-usage
4848
)
4949

50+
set(WARNING_FLAGS_VERSION18
51+
52+
# Own parameter
53+
-Wno-switch-default
54+
)
55+
5056
foreach(WARNING_FLAG ${WARNING_FLAGS})
5157
set(WARNING_FLAGS_SPACED "${WARNING_FLAGS_SPACED} ${WARNING_FLAG}")
5258
endforeach()
@@ -57,6 +63,12 @@ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16)
5763
endforeach()
5864
endif()
5965

66+
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 18 AND NOT CMAKE_CXX_COMPILER_ID MATCHES AppleClang)
67+
foreach(WARNING_FLAG ${WARNING_FLAGS_VERSION18})
68+
set(WARNING_FLAGS_SPACED "${WARNING_FLAGS_SPACED} ${WARNING_FLAG}")
69+
endforeach()
70+
endif()
71+
6072
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Werror -Weffc++")
6173
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_SPACED}")
6274

cmake/env.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC
7979
# An issue with visual studio 2019 with fetch project and same settings, so check early
8080
check_cxx_compiler_flag(/std:c++20 HAVE_FLAG_STD_CXX20)
8181
# Visual Studio 2019 will have clang-12, but cmake do not know how to set the standard for that.
82-
if(CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 13.0)
82+
if(CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 18.0)
8383
set(HAVE_FLAG_STD_CXX23 OFF)
8484
endif()
8585
else()

0 commit comments

Comments
 (0)