Skip to content

Commit

Permalink
๐Ÿ—๐Ÿ”จ Try more Catch2 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
GHF committed Nov 16, 2023
1 parent d9f05dc commit cb4c141
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ jobs:
- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCODE_COVERAGE=${{ matrix.coverage }} -DTEST_WITH_CXX23=${{ matrix.test_with_cxx23 }}

- name: Upload compile_commands.json
uses: actions/upload-artifact@v3
with:
name: compile_commands.json
path: compile_commands.json

- name: Build
run: cmake --build ${{github.workspace}}/build --parallel --config ${{env.BUILD_TYPE}}

Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ if(TOP_LEVEL_PROJECT)
list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/contrib)

if(CXX_COMPILER_ID MATCHES "Clang")
target_compile_options(Catch2 PRIVATE -stdlib=libc++)
target_compile_options(Catch2::Catch2 PUBLIC -stdlib=libc++)
target_compile_options(Catch2::Catch2WithMain PUBLIC -stdlib=libc++)
endif()

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
Expand Down

0 comments on commit cb4c141

Please sign in to comment.