From 909740c174a248762fc73081f9e0135fb7c81a57 Mon Sep 17 00:00:00 2001 From: Nikolai Wuttke Date: Sat, 13 Apr 2024 10:11:25 +0200 Subject: [PATCH 1/3] Stop using -Weverything --- cmake/rigel.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/rigel.cmake b/cmake/rigel.cmake index 0e7fa0b7..e863b48f 100644 --- a/cmake/rigel.cmake +++ b/cmake/rigel.cmake @@ -29,7 +29,8 @@ function(rigel_enable_warnings target) endif() elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") target_compile_options(${target} PRIVATE - -Weverything + -Wall + -Wextra -Wno-unknown-warning-option -Wno-c++98-compat -Wno-c++98-compat-pedantic From 980f648bb848915c163bd7a6d4c16a3cd29d40e9 Mon Sep 17 00:00:00 2001 From: Nikolai Wuttke Date: Sat, 13 Apr 2024 10:49:36 +0200 Subject: [PATCH 2/3] Update Google Benchmark --- benchmark/CMakeLists.txt | 2 +- benchmark/bench_string_utils.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index 184c4795..1137a18a 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -3,7 +3,7 @@ include(FetchContent) FetchContent_Declare( benchmark GIT_REPOSITORY https://github.com/google/benchmark.git - GIT_TAG v1.5.3 + GIT_TAG v1.8.3 ) FetchContent_GetProperties(benchmark) if(NOT benchmark_POPULATED) diff --git a/benchmark/bench_string_utils.cpp b/benchmark/bench_string_utils.cpp index 102bb31d..0a0d5bbc 100644 --- a/benchmark/bench_string_utils.cpp +++ b/benchmark/bench_string_utils.cpp @@ -27,7 +27,7 @@ static void BMStringSplit(benchmark::State& state) std::string const kInputString = "Hello, world"; for (auto _ : state) { - const auto v = rigel::strings::split(kInputString, ','); + auto v = rigel::strings::split(kInputString, ','); benchmark::DoNotOptimize(v); benchmark::ClobberMemory(); } From a44725f11f6b089c272fd79ec90d18b7e7a67813 Mon Sep 17 00:00:00 2001 From: Nikolai Wuttke Date: Sat, 13 Apr 2024 10:40:23 +0200 Subject: [PATCH 3/3] Fix Mac OS CI build --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eff31276..685aefa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,7 @@ jobs: - name: Test (release) run: cd build && ctest build_osx: - runs-on: macos-11 + runs-on: macos-latest steps: - uses: actions/checkout@v3 with: