File tree Expand file tree Collapse file tree 4 files changed +18
-9
lines changed
Expand file tree Collapse file tree 4 files changed +18
-9
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ on: [pull_request]
44jobs :
55 build :
66 name : build and test
7- runs-on : macos-11
7+ runs-on : macos-latest
88 steps :
99 - uses : actions/checkout@v2
1010 with :
1818 shell : bash
1919 run : |
2020 xcrun --show-sdk-path
21- SDK_PATH=$(find /Library/Developer/CommandLineTools/SDKs/MacOSX*.sdk -type d -maxdepth 0)
21+ SDK_PATH=$(find /Library/Developer/CommandLineTools/SDKs/MacOSX*.sdk -type d -maxdepth 0 | tail -n 1 )
2222 echo ${SDK_PATH}
23- cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_SANITIZERS=On -DCMAKE_OSX_SYSROOT=${SDK_PATH} && make all -j$(sysctl -n hw.ncpu)
23+ cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_SANITIZERS=On -DCMAKE_OSX_SYSROOT=${SDK_PATH} -DENABLE_WERROR=Off && make all -j$(sysctl -n hw.ncpu)
2424 - name : test
2525 shell : bash
2626 run : |
Original file line number Diff line number Diff line change @@ -8,6 +8,9 @@ INCLUDE(GNUInstallDirs)
88# Use a C++17 enabled compiler
99set (CMAKE_CXX_STANDARD 17)
1010
11+ option (ENABLE_WALL "Convert compiler warnings to errors" ON )
12+ option (ENABLE_WERROR "Convert compiler warnings to errors. Requires ENABLE_WALL" ON )
13+
1114# What type of build
1215if (NOT MSVC_IDE ) # TODO: May need to be extended for Xcode, CLion, etc.
1316 if (NOT CMAKE_BUILD_TYPE )
@@ -29,10 +32,16 @@ else()
2932endif ()
3033
3134# Show all warnings and treat as errors
32- if (MSVC )
33- add_compile_options (/W4 /WX)
34- else ()
35- add_compile_options (-Wall -Wextra -pedantic -Werror)
35+ if (MSVC AND ENABLE_WALL)
36+ add_compile_options (/W4)
37+ if (ENABLE_WERROR)
38+ add_compile_options (/WX)
39+ endif ()
40+ elseif (ENABLE_WALL)
41+ add_compile_options (-Wall -Wextra -pedantic)
42+ if (ENABLE_WERROR)
43+ add_compile_options (-Werror)
44+ endif ()
3645endif ()
3746
3847option (ENABLE_SANITIZERS "Use all the integrated sanitizers for Debug build" OFF )
Original file line number Diff line number Diff line change 33// some version info
44#define PRIME_SERVER_VERSION_MAJOR 0
55#define PRIME_SERVER_VERSION_MINOR 7
6- #define PRIME_SERVER_VERSION_PATCH 0
6+ #define PRIME_SERVER_VERSION_PATCH 1
77
88#include < cstdint>
99#include < functional>
Submodule
logging updated from 10ba199 to 839e1f2
You can’t perform that action at this time.
0 commit comments