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

ci: CMake used by Conan bumped to >= 4.0.2

Browse Source
This commit is contained in:
Mateusz Pusz
2025-07-10 12:00:26 +02:00
parent 13b1988bcf
commit d9dce46c21
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
conanfile.py
View File

@@ -219,7 +219,7 @@ class MPUnitsConan(ConanFile):
self.requires("fmt/11.1.4", transitive_headers=True) self.requires("fmt/11.1.4", transitive_headers=True)
def build_requirements(self): def build_requirements(self):
self.tool_requires("cmake/[>=3.31 <4]") self.tool_requires("cmake/[>=4.0.2 <5]")
if self._build_all: if self._build_all:
if not self.options.freestanding: if not self.options.freestanding:
self.test_requires("catch2/3.8.0") self.test_requires("catch2/3.8.0")
@@ -274,7 +274,7 @@ class MPUnitsConan(ConanFile):
tc.cache_variables["CMAKE_CXX_MODULE_STD"] = True tc.cache_variables["CMAKE_CXX_MODULE_STD"] = True
# Current experimental support according to `Help/dev/experimental.rst` # Current experimental support according to `Help/dev/experimental.rst`
tc.cache_variables["CMAKE_EXPERIMENTAL_CXX_IMPORT_STD"] = ( tc.cache_variables["CMAKE_EXPERIMENTAL_CXX_IMPORT_STD"] = (
"0e5b6991-d74f-4b3d-a41c-cf096e0b2508" "d0edc3af-4c50-42ea-a356-e2862fe7a444"
) )
# TODO remove the below when Conan will learn to handle C++ modules # TODO remove the below when Conan will learn to handle C++ modules

2
test_package/conanfile.py
View File

@@ -47,7 +47,7 @@ class TestPackageConan(ConanFile):
tc.cache_variables["CMAKE_CXX_MODULE_STD"] = True tc.cache_variables["CMAKE_CXX_MODULE_STD"] = True
# Current experimental support according to `Help/dev/experimental.rst` # Current experimental support according to `Help/dev/experimental.rst`
tc.cache_variables["CMAKE_EXPERIMENTAL_CXX_IMPORT_STD"] = ( tc.cache_variables["CMAKE_EXPERIMENTAL_CXX_IMPORT_STD"] = (
"0e5b6991-d74f-4b3d-a41c-cf096e0b2508" "d0edc3af-4c50-42ea-a356-e2862fe7a444"
) )
# TODO remove the below when Conan will learn to handle C++ modules # TODO remove the below when Conan will learn to handle C++ modules
if opt.cxx_modules: if opt.cxx_modules: