fix versions and ignore warning on std::move

aibasel · Jul 5, 2024 · 2ab0529 · 2ab0529
1 parent 4ea25b6
commit 2ab0529
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -20,10 +20,10 @@ jobs:
     strategy:
       matrix:
         version:
-          - {ubuntu: 'ubuntu-22.04', python: '3.10', cc: gcc-13, cxx: g++-13, run_tox_tests: true}
-          - {ubuntu: 'ubuntu-22.04', python: '3.10', cc: clang-14, cxx: clang++-14, run_tox_tests: false}
+          - {ubuntu: 'ubuntu-22.04', python: '3.10', cc: gcc-12, cxx: g++-12, run_tox_tests: true}
+          - {ubuntu: 'ubuntu-22.04', python: '3.10', cc: clang-15, cxx: clang++-15, run_tox_tests: false}
           - {ubuntu: 'ubuntu-24.04', python: '3.10', cc: gcc-14, cxx: g++-14, run_tox_tests: true}
-          - {ubuntu: 'ubuntu-24.04', python: '3.10', cc: clang-14, cxx: clang++-14, run_tox_tests: false}
+          - {ubuntu: 'ubuntu-24.04', python: '3.10', cc: clang-18, cxx: clang++-18, run_tox_tests: false}
     env:
       CC: ${{ matrix.version.cc }}
       CXX: ${{ matrix.version.cxx }}

diff --git a/src/search/cmake/common_cxx_flags.cmake b/src/search/cmake/common_cxx_flags.cmake
@@ -45,3 +45,9 @@ target_compile_options(common_cxx_warnings INTERFACE
     #   /wd4244: conversion with possible loss of data
     #   /wd4267: conversion from size_t to int with possible loss of data
 target_link_libraries(common_cxx_flags INTERFACE common_cxx_warnings)
+
+set(v15_or_later "$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,15>")
+set(using_apple_clang "$<CXX_COMPILER_ID:AppleClang>")
+set(ignored_std_warning "$<AND:${using_apple_clang},${v15_or_later}>")
+target_compile_options(common_cxx_warnings INTERFACE
+    "$<${ignored_std_warning}:-Wno-unqualified-std-cast-call>")