feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

Merge branch 'master' into chiphogg/intmax

Browse Source
This commit is contained in:
Chip Hogg
2022-03-01 02:30:13 +00:00
parent 632f2785a9 5668257fe1
commit 7cda52af55
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
conanfile.py
View File

@@ -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")

4
example/aliases/CMakeLists.txt
View File

@@ -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()

4
example/literals/CMakeLists.txt
View File

@@ -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()

4
example/references/CMakeLists.txt
View File

@@ -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()

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

@@ -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")