mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-04 04:44:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

catch2 updated to 2.13.0

Browse Source
This commit is contained in:
Mateusz Pusz
2020-08-17 21:56:58 +02:00
parent 8c6237fd82
commit af996aaed3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conanfile.py
View File

@@ -87,7 +87,7 @@ class UnitsConan(ConanFile):
def build_requirements(self): def build_requirements(self):
if self._run_tests: if self._run_tests:
self.build_requires("Catch2/2.11.0@catchorg/stable") self.build_requires("catch2/2.13.0")
# TODO update doxygen to the latest version when available # TODO update doxygen to the latest version when available
self.build_requires("doxygen_installer/1.8.17@bincrafters/stable") self.build_requires("doxygen_installer/1.8.17@bincrafters/stable")
self.build_requires("linear_algebra/0.7.0@public-conan/testing") self.build_requires("linear_algebra/0.7.0@public-conan/testing")

6
test/unit_test/runtime/CMakeLists.txt
View File

@@ -21,7 +21,7 @@
# SOFTWARE. # SOFTWARE.
# check if conan installed a test framework # check if conan installed a test framework
conan_check_testing(Catch2) conan_check_testing(catch2)
add_executable(unit_tests_runtime add_executable(unit_tests_runtime
catch_main.cpp catch_main.cpp
@@ -34,8 +34,8 @@ add_executable(unit_tests_runtime
target_link_libraries(unit_tests_runtime target_link_libraries(unit_tests_runtime
PRIVATE PRIVATE
mp::units mp::units
$<IF:$<TARGET_EXISTS:CONAN_PKG::Catch2>,CONAN_PKG::Catch2,Catch2::Catch2> $<IF:$<TARGET_EXISTS:CONAN_PKG::catch2>,CONAN_PKG::catch2,Catch2::Catch2>
) )
include(lib/cmake/Catch2/Catch) include(Catch)
catch_discover_tests(unit_tests_runtime) catch_discover_tests(unit_tests_runtime)