From ba5c9703b16e69f9b171abdb9b304d04628a9f0d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 21 Nov 2024 04:58:11 -0500 Subject: Experimental: recycle the `import std` UUID Now that GCC is supported, update the feature UUID. (cherry picked from commit 469175c2e6 (Experimental: recycle the `import std` UUID, 2024-11-21)) --- Help/dev/experimental.rst | 2 +- Source/cmExperimental.cxx | 2 +- .../CXXModules/examples/import-std-export-no-std-build/CMakeLists.txt | 2 +- .../CXXModules/examples/import-std-export-no-std-install/CMakeLists.txt | 2 +- .../CXXModules/examples/import-std-no-std-property/CMakeLists.txt | 2 +- .../CXXModules/examples/import-std-not-in-export-build/CMakeLists.txt | 2 +- .../CXXModules/examples/import-std-not-in-export-install/CMakeLists.txt | 2 +- Tests/RunCMake/CXXModules/examples/import-std-transitive/CMakeLists.txt | 2 +- Tests/RunCMake/CXXModules/examples/import-std/CMakeLists.txt | 2 +- Tests/RunCMake/cmake_language/Experimental/CxxImportStd-set.cmake | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Help/dev/experimental.rst b/Help/dev/experimental.rst index f5b9114..b401595 100644 --- a/Help/dev/experimental.rst +++ b/Help/dev/experimental.rst @@ -63,7 +63,7 @@ In order to activate support for ``import std`` in C++23 and newer targets, set * variable ``CMAKE_EXPERIMENTAL_CXX_IMPORT_STD`` to -* value ``0e5b6991-d74f-4b3d-a41c-cf096e0b2508``. +* value ``a9e1cf81-9932-4810-974b-6eccaf14e457``. This UUID may change in future versions of CMake. Be sure to use the value documented here by the source tree of the version of CMake with which you are diff --git a/Source/cmExperimental.cxx b/Source/cmExperimental.cxx index 913db87..053579b 100644 --- a/Source/cmExperimental.cxx +++ b/Source/cmExperimental.cxx @@ -39,7 +39,7 @@ cmExperimental::FeatureData LookupTable[] = { false }, // CxxImportStd { "CxxImportStd", - "0e5b6991-d74f-4b3d-a41c-cf096e0b2508", + "a9e1cf81-9932-4810-974b-6eccaf14e457", "CMAKE_EXPERIMENTAL_CXX_IMPORT_STD", "CMake's support for `import std;` in C++23 and newer is experimental. It " "is meant only for experimentation and feedback to CMake developers.", diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/CMakeLists.txt index 89350ef..5d41b0e 100644 --- a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/CMakeLists.txt @@ -1,5 +1,5 @@ set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD - "0e5b6991-d74f-4b3d-a41c-cf096e0b2508") + "a9e1cf81-9932-4810-974b-6eccaf14e457") cmake_minimum_required(VERSION 3.29) project(cxx_modules_import_std_export_no_std CXX) diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/CMakeLists.txt index 62d9d91..fccb8b4 100644 --- a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/CMakeLists.txt @@ -1,5 +1,5 @@ set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD - "0e5b6991-d74f-4b3d-a41c-cf096e0b2508") + "a9e1cf81-9932-4810-974b-6eccaf14e457") cmake_minimum_required(VERSION 3.29) project(cxx_modules_import_std_export_no_std CXX) diff --git a/Tests/RunCMake/CXXModules/examples/import-std-no-std-property/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/import-std-no-std-property/CMakeLists.txt index a605e95..f21da1e 100644 --- a/Tests/RunCMake/CXXModules/examples/import-std-no-std-property/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/import-std-no-std-property/CMakeLists.txt @@ -1,5 +1,5 @@ set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD - "0e5b6991-d74f-4b3d-a41c-cf096e0b2508") + "a9e1cf81-9932-4810-974b-6eccaf14e457") cmake_minimum_required(VERSION 3.29) project(cxx_modules_import_std_no_std_property CXX) diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/CMakeLists.txt index 3112002..e3e11d1 100644 --- a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/CMakeLists.txt @@ -1,5 +1,5 @@ set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD - "0e5b6991-d74f-4b3d-a41c-cf096e0b2508") + "a9e1cf81-9932-4810-974b-6eccaf14e457") cmake_minimum_required(VERSION 3.29) project(cxx_modules_import_std_not_in_export CXX) diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/CMakeLists.txt index 788ea84..53ef333 100644 --- a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/CMakeLists.txt @@ -1,5 +1,5 @@ set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD - "0e5b6991-d74f-4b3d-a41c-cf096e0b2508") + "a9e1cf81-9932-4810-974b-6eccaf14e457") cmake_minimum_required(VERSION 3.29) project(cxx_modules_import_std_not_in_export CXX) diff --git a/Tests/RunCMake/CXXModules/examples/import-std-transitive/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/import-std-transitive/CMakeLists.txt index 4d1d5df..2f12662 100644 --- a/Tests/RunCMake/CXXModules/examples/import-std-transitive/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/import-std-transitive/CMakeLists.txt @@ -1,5 +1,5 @@ set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD - "0e5b6991-d74f-4b3d-a41c-cf096e0b2508") + "a9e1cf81-9932-4810-974b-6eccaf14e457") cmake_minimum_required(VERSION 3.29) diff --git a/Tests/RunCMake/CXXModules/examples/import-std/CMakeLists.txt b/Tests/RunCMake/CXXModules/examples/import-std/CMakeLists.txt index bffcd66..95b6636 100644 --- a/Tests/RunCMake/CXXModules/examples/import-std/CMakeLists.txt +++ b/Tests/RunCMake/CXXModules/examples/import-std/CMakeLists.txt @@ -1,5 +1,5 @@ set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD - "0e5b6991-d74f-4b3d-a41c-cf096e0b2508") + "a9e1cf81-9932-4810-974b-6eccaf14e457") cmake_minimum_required(VERSION 3.29) project(cxx_modules_import_std CXX) diff --git a/Tests/RunCMake/cmake_language/Experimental/CxxImportStd-set.cmake b/Tests/RunCMake/cmake_language/Experimental/CxxImportStd-set.cmake index a002297..4a9edf4 100644 --- a/Tests/RunCMake/cmake_language/Experimental/CxxImportStd-set.cmake +++ b/Tests/RunCMake/cmake_language/Experimental/CxxImportStd-set.cmake @@ -1,5 +1,5 @@ set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD - "0e5b6991-d74f-4b3d-a41c-cf096e0b2508") + "a9e1cf81-9932-4810-974b-6eccaf14e457") cmake_language(GET_EXPERIMENTAL_FEATURE_ENABLED "CxxImportStd" -- cgit v0.12