Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,6 @@ jobs:
boost:p
fmt:p
${{ matrix.sys != 'mingw32' && 'range-v3:p' || '' }}
- name: setup catch2
run: |
mkdir -p cmake/catch2
curl -L -o cmake/catch2/catch.hpp https://github.com/catchorg/Catch2/releases/download/v2.13.10/catch.hpp
cat > cmake/FindCatch2.cmake << 'EOF'
add_library(Catch2::Catch2 INTERFACE IMPORTED)
set_target_properties(Catch2::Catch2 PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}"
)
set(Catch2_FOUND TRUE)
EOF
- name: build
run: |
cmake . -G Ninja -DCMAKE_MODULE_PATH=$(pwd)/cmake -DENABLE_RANGE_V3=${{ matrix.range_v3 }} -DENABLE_FMT=ON -DBUILD_TESTING=ON -DCMAKE_CXX_STANDARD=${{ matrix.cpp }} -DCMAKE_CXX_FLAGS='-Wall -Wextra -Wconversion -Wshadow -pedantic -Werror -Wno-c2y-extensions' -DCMAKE_BUILD_TYPE=Release
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@
nativeBuildInputs = with pkgs.buildPackages; [
(fmt.override { inherit stdenv; })
boost
catch2
clang-tools
cmakeCurses
conan
range-v3
] ++ app.nativeBuildInputs;
hardeningDisable = [ "fortify" ];
};

in {
Expand Down
3 changes: 1 addition & 2 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ endif()
option(ENABLE_RANGE_V3 "If ON the tests to Range-v3 library will be enabled" OFF)
option(ENABLE_FMT "If ON the tests to {fmt} library will be enabled" OFF)

find_package(Catch2 REQUIRED)
find_package(Boost REQUIRED)

if (ENABLE_RANGE_V3)
Expand All @@ -26,7 +25,7 @@ include_directories(${PROJECT_SOURCE_DIR})
function(declare_test name)
add_executable(test_${name} test_${name}.cpp)
add_test(NAME test_${name} COMMAND test_${name})
target_link_libraries(test_${name} PRIVATE Catch2::Catch2 Boost::headers)
target_link_libraries(test_${name} PRIVATE Boost::headers)

if (ENABLE_RANGE_V3)
target_link_libraries(test_${name} PRIVATE range-v3::range-v3)
Expand Down
Loading
Loading