Skip to content

Commit 6f64834

Browse files
committed
Move warning config to test project
1 parent 6bb5564 commit 6f64834

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

.github/workflows/cmake.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
platform:
16-
- { name: Ubuntu GCC, os: ubuntu-latest, compiler: g++, arch: "64", cmakepp: "", flags: "-DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_FLAGS='--coverage -Wall -Wextra -Werror'"}
17-
- { name: Ubuntu Clang, os: ubuntu-latest, compiler: clang++, arch: "64", cmakepp: "", flags: "-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS='-stdlib=libc++ -Wall -Wextra -Werror'"}
18-
- { name: Windows 32, os: windows-latest, compiler: vs2019, arch: "32", cmakepp: "", flags: "-A Win32 -DCMAKE_CXX_FLAGS='//W4 //WX'"}
19-
- { name: Windows 64, os: windows-latest, compiler: vs2019, arch: "64", cmakepp: "", flags: "-A x64 -DCMAKE_CXX_FLAGS='//W4 //WX'"}
20-
- { name: MacOS, os: macos-latest, compiler: clang++, arch: "64", cmakepp: "", flags: "-DCMAKE_CXX_FLAGS='-Wall -Wextra -Werror'"}
21-
- { name: WebAssembly, os: ubuntu-latest, compiler: em++, arch: "32", cmakepp: "emcmake", flags: "-DCMAKE_CXX_FLAGS='-Wall -Wextra -Werror -s DISABLE_EXCEPTION_CATCHING=0' -DCMAKE_CROSSCOMPILING_EMULATOR=node"}
16+
- { name: Ubuntu GCC, os: ubuntu-latest, compiler: g++, arch: "64", cmakepp: "", flags: "-DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_FLAGS='--coverage'"}
17+
- { name: Ubuntu Clang, os: ubuntu-latest, compiler: clang++, arch: "64", cmakepp: "", flags: "-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS='-stdlib=libc++'"}
18+
- { name: Windows 32, os: windows-latest, compiler: vs2019, arch: "32", cmakepp: "", flags: "-A Win32"}
19+
- { name: Windows 64, os: windows-latest, compiler: vs2019, arch: "64", cmakepp: "", flags: "-A x64"}
20+
- { name: MacOS, os: macos-latest, compiler: clang++, arch: "64", cmakepp: "", flags: ""}
21+
- { name: WebAssembly, os: ubuntu-latest, compiler: em++, arch: "32", cmakepp: "emcmake", flags: "-DCMAKE_CXX_FLAGS='-s DISABLE_EXCEPTION_CATCHING=0' -DCMAKE_CROSSCOMPILING_EMULATOR=node"}
2222
build-type:
2323
- Release
2424
- Debug

tests/CMakeLists.txt

+14
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@ function(add_platform_definitions TARGET)
1313
target_compile_definitions(${TARGET} PRIVATE OUP_COMPILER_MSVC)
1414
endif()
1515
endif()
16+
17+
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
18+
target_compile_options(${TARGET} PRIVATE -Wall)
19+
target_compile_options(${TARGET} PRIVATE -Wextra)
20+
target_compile_options(${TARGET} PRIVATE -Werror)
21+
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
22+
target_compile_options(${TARGET} PRIVATE -Wall)
23+
target_compile_options(${TARGET} PRIVATE -Wextra)
24+
target_compile_options(${TARGET} PRIVATE -Werror)
25+
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
26+
target_compile_options(${target} PRIVATE /W4)
27+
target_compile_options(${target} PRIVATE /WX)
28+
target_compile_options(${target} PRIVATE /EHs)
29+
endif()
1630
endfunction()
1731

1832
set(RUNTIME_TEST_FILES

0 commit comments

Comments
 (0)