From d9dce46c21f6d915424112fd8b5e2163addc051b Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 10 Jul 2025 12:00:26 +0200 Subject: [PATCH] ci: CMake used by Conan bumped to >= 4.0.2 --- conanfile.py | 4 ++-- test_package/conanfile.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conanfile.py b/conanfile.py index c19c9379..e7f907a6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -219,7 +219,7 @@ class MPUnitsConan(ConanFile): self.requires("fmt/11.1.4", transitive_headers=True) def build_requirements(self): - self.tool_requires("cmake/[>=3.31 <4]") + self.tool_requires("cmake/[>=4.0.2 <5]") if self._build_all: if not self.options.freestanding: self.test_requires("catch2/3.8.0") @@ -274,7 +274,7 @@ class MPUnitsConan(ConanFile): tc.cache_variables["CMAKE_CXX_MODULE_STD"] = True # Current experimental support according to `Help/dev/experimental.rst` 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 diff --git a/test_package/conanfile.py b/test_package/conanfile.py index 7458b5d7..335f06c5 100644 --- a/test_package/conanfile.py +++ b/test_package/conanfile.py @@ -47,7 +47,7 @@ class TestPackageConan(ConanFile): tc.cache_variables["CMAKE_CXX_MODULE_STD"] = True # Current experimental support according to `Help/dev/experimental.rst` 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 if opt.cxx_modules: