From dc6b4dd635b002c43ab0b0ac3d7284fd22a2e0bd Mon Sep 17 00:00:00 2001 From: Steve Downey Date: Fri, 31 Jul 2026 23:16:35 -0400 Subject: [PATCH] Add CMake 4.4 import std experimental UUID The vcpkg-ci "Test port templates {"modules":true}" job began failing when the beman infra container upgraded CMake to 4.4.0. The `>= 4.3.0` branch applied the 4.3 UUID (451f2fe2-...) to 4.4, which CMake 4.4 rejects ("CMAKE_EXPERIMENTAL_CXX_IMPORT_STD is set to incorrect value"), so CXX_MODULE_STD toolchain support was never enabled and the generate step failed. Add a dedicated `>= 4.4.0` branch using the 4.4 UUID (f35a9ac6-8463-4d38-8eec-5d6008153e7d), matching the upstream beman exemplar template. Co-Authored-By: Claude Opus 4.8 (1M context) --- infra/cmake/enable-experimental-import-std.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/infra/cmake/enable-experimental-import-std.cmake b/infra/cmake/enable-experimental-import-std.cmake index e41a5f7..3c6d688 100644 --- a/infra/cmake/enable-experimental-import-std.cmake +++ b/infra/cmake/enable-experimental-import-std.cmake @@ -1,5 +1,9 @@ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0") +if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.4.0") + set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD + "f35a9ac6-8463-4d38-8eec-5d6008153e7d" + ) +elseif(CMAKE_VERSION VERSION_GREATER_EQUAL "4.3.0") set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "451f2fe2-a8a2-47c3-bc32-94786d8fc91b" )