From af996aaed31d004e5e59eebdd71286bc34530c3b Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Mon, 17 Aug 2020 21:56:58 +0200 Subject: [PATCH] catch2 updated to 2.13.0 --- conanfile.py | 2 +- test/unit_test/runtime/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index b7026b6b..b8c0184c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -87,7 +87,7 @@ class UnitsConan(ConanFile): def build_requirements(self): 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 self.build_requires("doxygen_installer/1.8.17@bincrafters/stable") self.build_requires("linear_algebra/0.7.0@public-conan/testing") diff --git a/test/unit_test/runtime/CMakeLists.txt b/test/unit_test/runtime/CMakeLists.txt index 098ece1f..9ed02737 100644 --- a/test/unit_test/runtime/CMakeLists.txt +++ b/test/unit_test/runtime/CMakeLists.txt @@ -21,7 +21,7 @@ # SOFTWARE. # check if conan installed a test framework -conan_check_testing(Catch2) +conan_check_testing(catch2) add_executable(unit_tests_runtime catch_main.cpp @@ -34,8 +34,8 @@ add_executable(unit_tests_runtime target_link_libraries(unit_tests_runtime PRIVATE mp::units - $,CONAN_PKG::Catch2,Catch2::Catch2> + $,CONAN_PKG::catch2,Catch2::Catch2> ) -include(lib/cmake/Catch2/Catch) +include(Catch) catch_discover_tests(unit_tests_runtime)