From 0a6d11cf271fba14ebe63e5c9c9ddc26ad37c9eb Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Mon, 28 Feb 2022 18:25:20 +0100 Subject: [PATCH 1/3] Depracated `build_requires(..., force_host_context=True)` replaced with `test_requires(...)` --- conanfile.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index 17b0d4e4..4a3a5b6f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -26,7 +26,7 @@ from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake from conans.errors import ConanInvalidConfiguration import os, re -required_conan_version = ">=1.40.0" +required_conan_version = ">=1.43.0" class UnitsConan(ConanFile): name = "mp-units" @@ -92,8 +92,8 @@ class UnitsConan(ConanFile): def build_requirements(self): if self._run_tests: - self.build_requires("catch2/2.13.7", force_host_context=True) # TODO replace with test_requires in Conan 2.0 - self.build_requires("wg21-linear_algebra/0.7.2", force_host_context=True) # TODO replace with test_requires in Conan 2.0 + self.test_requires("catch2/2.13.7") + self.test_requires("wg21-linear_algebra/0.7.2") if self.options.build_docs: self.build_requires("doxygen/1.9.2") From 87ab85625b8fe01a922e144a6870d0e0ffc47710 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Mon, 28 Feb 2022 18:27:03 +0100 Subject: [PATCH 2/3] The latest Conan generates `Catch2` CMake target --- test/unit_test/runtime/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit_test/runtime/CMakeLists.txt b/test/unit_test/runtime/CMakeLists.txt index 4ed735e7..ba919690 100644 --- a/test/unit_test/runtime/CMakeLists.txt +++ b/test/unit_test/runtime/CMakeLists.txt @@ -34,7 +34,7 @@ add_executable(unit_tests_runtime ) target_link_libraries(unit_tests_runtime PRIVATE mp-units::mp-units - catch2::catch2 + Catch2::Catch2 ) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") From 5668257fe1db6cc0722024a9948d475432f8dbe0 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Mon, 28 Feb 2022 19:23:34 +0100 Subject: [PATCH 3/3] build: Conan geerated target renamed to `wg21_linear_algebra` --- example/aliases/CMakeLists.txt | 4 ++-- example/literals/CMakeLists.txt | 4 ++-- example/references/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/example/aliases/CMakeLists.txt b/example/aliases/CMakeLists.txt index e61b38a4..27f4a246 100644 --- a/example/aliases/CMakeLists.txt +++ b/example/aliases/CMakeLists.txt @@ -51,7 +51,7 @@ if(NOT ${projectPrefix}LIBCXX) ${projectPrefix}NO_REFERENCES ) - find_package(wg21-linear_algebra CONFIG REQUIRED) + find_package(wg21_linear_algebra CONFIG REQUIRED) add_example(linear_algebra mp-units::core-fmt mp-units::core-io mp-units::si) - target_link_libraries(linear_algebra-aliases PRIVATE wg21-linear_algebra::wg21-linear_algebra) + target_link_libraries(linear_algebra-aliases PRIVATE wg21_linear_algebra::wg21_linear_algebra) endif() diff --git a/example/literals/CMakeLists.txt b/example/literals/CMakeLists.txt index a968b3fd..4b5eeb9e 100644 --- a/example/literals/CMakeLists.txt +++ b/example/literals/CMakeLists.txt @@ -50,7 +50,7 @@ if(NOT ${projectPrefix}LIBCXX) ${projectPrefix}NO_ALIASES ) - find_package(wg21-linear_algebra CONFIG REQUIRED) + find_package(wg21_linear_algebra CONFIG REQUIRED) add_example(linear_algebra mp-units::core-fmt mp-units::core-io mp-units::si) - target_link_libraries(linear_algebra-literals PRIVATE wg21-linear_algebra::wg21-linear_algebra) + target_link_libraries(linear_algebra-literals PRIVATE wg21_linear_algebra::wg21_linear_algebra) endif() diff --git a/example/references/CMakeLists.txt b/example/references/CMakeLists.txt index 3f6a7e0e..f014d400 100644 --- a/example/references/CMakeLists.txt +++ b/example/references/CMakeLists.txt @@ -50,7 +50,7 @@ if(NOT ${projectPrefix}LIBCXX) ${projectPrefix}NO_ALIASES ) - find_package(wg21-linear_algebra CONFIG REQUIRED) + find_package(wg21_linear_algebra CONFIG REQUIRED) add_example(linear_algebra mp-units::core-fmt mp-units::core-io mp-units::si) - target_link_libraries(linear_algebra-references PRIVATE wg21-linear_algebra::wg21-linear_algebra) + target_link_libraries(linear_algebra-references PRIVATE wg21_linear_algebra::wg21_linear_algebra) endif()