diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 127f0ee..8b349d0 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -36,7 +36,7 @@ jobs: # ignore brew link warning, revert after https://github.com/actions/setup-python/issues/577 is fixed run: | brew update - brew install llvm@17 || true + brew install llvm@18 || true brew install ninja brew install cmake @@ -63,9 +63,9 @@ jobs: - name: CMake Configure (macos64) if: ${{ matrix.os == 'macos-12' }} env: - CC: /usr/local/opt/llvm@17/bin/clang - CXX: /usr/local/opt/llvm@17/bin/clang++ - run: cmake -B ${{env.build_directory}} -G "Ninja" -DCMAKE_BUILD_TYPE=${{env.build_type}} -DREDUMPER_VERSION_BUILD=${{github.run_number}} -DREDUMPER_CLANG_LINK_OPTIONS="-L/usr/local/opt/llvm@17/lib/c++" + CC: /usr/local/opt/llvm@18/bin/clang + CXX: /usr/local/opt/llvm@18/bin/clang++ + run: cmake -B ${{env.build_directory}} -G "Ninja" -DCMAKE_BUILD_TYPE=${{env.build_type}} -DREDUMPER_VERSION_BUILD=${{github.run_number}} -DREDUMPER_CLANG_LINK_OPTIONS="-L/usr/local/opt/llvm@18/lib/c++" - name: CMake Build run: cmake --build ${{env.build_directory}} --config ${{env.build_type}} diff --git a/CMakeLists.txt b/CMakeLists.txt index 8666973..a493087 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,17 +66,8 @@ add_definitions(-DREDUMPER_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} -DREDUMPER_VERSION_BUILD=${REDUMPER_VERSION_BUILD}) if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # -fexperimental-library is required for clang-16 as std::format is defined there add_compile_options($<$:-stdlib=libc++>) add_link_options(-stdlib=libc++ ${REDUMPER_CLANG_LINK_OPTIONS}) - - # silence implicit modules use warning - # TL;DR, this will be taken cared of by listing module dependencies explicitly (cmake) - # more information: - # https://github.com/llvm/llvm-project/issues/62707 - if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 17) - add_compile_options(-Wno-read-modules-implicitly) - endif() elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") add_compile_options(-Wall -Wextra -Werror)