diff --git a/conanfile.py b/conanfile.py index 1b3d1532..e2bbf951 100644 --- a/conanfile.py +++ b/conanfile.py @@ -74,8 +74,8 @@ class UnitsConan(ConanFile): def build_requirements(self): if self._run_tests: - self.build_requires("catch2/2.13.4", force_host_context=True) # TODO replace with test_requires in Conan 2.0 - self.build_requires("linear_algebra/0.7.1@conan-oss/stable", force_host_context=True) # TODO replace with test_requires in Conan 2.0 + self.build_requires("catch2/2.13.4", 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 if self.options.build_docs: self.build_requires("doxygen/1.9.2") diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index ea4bd69e..9eb93fe6 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -8,7 +8,7 @@ - fix: account for different dimensions in `quantity_point_cast`'s constraint - build: Minimum Conan version changed to 1.40 - build: doxygen updated to 1.9.2 - - build: linear_algebra updated to 0.7.1 + - build: linear algebra switched to wg21-linear_algebra/0.7.2 - **0.7.0 May 11, 2021** - (!) refactor: `ScalableNumber` renamed to `Representation` diff --git a/docs/usage.rst b/docs/usage.rst index c753f22f..25d46204 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -363,7 +363,6 @@ in **mp-units** repository, you should: .. code-block:: shell - conan remote add linear-algebra https://twonington.jfrog.io/artifactory/api/conan/conan-oss git clone https://github.com/mpusz/units.git && cd units pip3 install -r docs/requirements.txt mkdir units/build && cd units/build diff --git a/example/aliases/CMakeLists.txt b/example/aliases/CMakeLists.txt index 331b6a84..22c10ef0 100644 --- a/example/aliases/CMakeLists.txt +++ b/example/aliases/CMakeLists.txt @@ -51,7 +51,7 @@ if(NOT UNITS_LIBCXX) UNITS_NO_REFERENCES ) - find_package(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 linear_algebra::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 676c8296..5da510ca 100644 --- a/example/literals/CMakeLists.txt +++ b/example/literals/CMakeLists.txt @@ -50,7 +50,7 @@ if(NOT UNITS_LIBCXX) UNITS_NO_ALIASES ) - find_package(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 linear_algebra::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 56054880..750d38c4 100644 --- a/example/references/CMakeLists.txt +++ b/example/references/CMakeLists.txt @@ -50,7 +50,7 @@ if(NOT UNITS_LIBCXX) UNITS_NO_ALIASES ) - find_package(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 linear_algebra::linear_algebra) + target_link_libraries(linear_algebra-references PRIVATE wg21_linear_algebra::wg21_linear_algebra) endif()