Skip to content

Commit

Permalink
Use Catch2 from conan
Browse files Browse the repository at this point in the history
  • Loading branch information
pinkwah committed Dec 5, 2022
1 parent 74e5581 commit edeff62
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 17,883 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ conan_cmake_run(
# Packages
REQUIRES
backward-cpp/1.6
catch2/2.13.9
fmt/8.0.1
# Options
OPTIONS
catch2:with_main=True
${conan_opts}
# Force cppstd to be the same as this CMakeLists.txt's
SETTINGS
Expand Down Expand Up @@ -433,9 +435,7 @@ if(ERT_LINUX)
endif()

if(BUILD_TESTS)
set(CATCH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/Catch2)
add_library(Catch INTERFACE)
target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR})
find_package(Catch2 REQUIRED)
endif()

add_subdirectory(lib)
Expand Down
Loading

0 comments on commit edeff62

Please sign in to comment.