Просмотр исходного кода

export: Reset CPS export experimental gate

Change the UUID associated with CPS export. This is in preparation for
refactoring the `export` command interface.
Matthew Woehlke 1 месяц назад
Родитель
Сommit
a121e5d49e

+ 1 - 1
Help/dev/experimental.rst

@@ -45,7 +45,7 @@ Export |CPS| Package Information
 In order to activate support for this experimental feature, set
 
 * variable ``CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO`` to
-* value ``b80be207-778e-46ba-8080-b23bba22639e``.
+* value ``7fa7d13b-8308-4dc7-af39-9e450456d68f``.
 
 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

+ 1 - 1
Source/cmExperimental.cxx

@@ -48,7 +48,7 @@ cmExperimental::FeatureData const LookupTable[] = {
     cmExperimental::TryCompileCondition::Always },
   // ExportPackageInfo
   { "ExportPackageInfo",
-    "b80be207-778e-46ba-8080-b23bba22639e",
+    "7fa7d13b-8308-4dc7-af39-9e450456d68f",
     "CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO",
     "CMake's support for exporting package information in the Common Package "
     "Specification format is experimental. It is meant only for "

+ 1 - 1
Tests/RunCMake/CpsExportImportBuild/RunCMakeTest.cmake

@@ -2,7 +2,7 @@ include(RunCMake)
 
 set(RunCMake_TEST_OPTIONS
   -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=b80be207-778e-46ba-8080-b23bba22639e"
+  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
   "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
   )
 

+ 1 - 1
Tests/RunCMake/CpsExportImportInstall/RunCMakeTest.cmake

@@ -2,7 +2,7 @@ include(RunCMake)
 
 set(RunCMake_TEST_OPTIONS
   -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=b80be207-778e-46ba-8080-b23bba22639e"
+  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
   "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
   )
 

+ 1 - 1
Tests/RunCMake/ExportPackageInfo/ExperimentalWarning.cmake

@@ -1,6 +1,6 @@
 set(
   CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
-  "b80be207-778e-46ba-8080-b23bba22639e"
+  "7fa7d13b-8308-4dc7-af39-9e450456d68f"
   )
 
 add_library(foo INTERFACE)

+ 1 - 1
Tests/RunCMake/ExportPackageInfo/RunCMakeTest.cmake

@@ -11,7 +11,7 @@ run_cmake(VersionCheckWarning)
 # Enable experimental feature and suppress warnings
 set(RunCMake_TEST_OPTIONS
   -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=b80be207-778e-46ba-8080-b23bba22639e"
+  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
   "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
   )
 

+ 1 - 1
Tests/RunCMake/ExportPackageInfo/VersionCheckWarning.cmake

@@ -1,6 +1,6 @@
 set(
   CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
-  "b80be207-778e-46ba-8080-b23bba22639e"
+  "7fa7d13b-8308-4dc7-af39-9e450456d68f"
 )
 
 add_library(foo INTERFACE)

+ 1 - 1
Tests/RunCMake/ExportSbom/RunCMakeTest.cmake

@@ -4,7 +4,7 @@ set(common_test_options
   -Wno-dev
   "-DCMAKE_EXPERIMENTAL_GENERATE_SBOM:STRING=ca494ed3-b261-4205-a01f-603c95e4cae0"
   "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=b80be207-778e-46ba-8080-b23bba22639e"
+  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
 )
 
 function(run_cmake_install test)

+ 1 - 1
Tests/RunCMake/InstallExportsAsPackageInfo/ExperimentalWarning.cmake

@@ -1,6 +1,6 @@
 set(
   CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
-  "b80be207-778e-46ba-8080-b23bba22639e"
+  "7fa7d13b-8308-4dc7-af39-9e450456d68f"
   )
 set(
   CMAKE_EXPERIMENTAL_MAPPED_PACKAGE_INFO

+ 1 - 1
Tests/RunCMake/InstallExportsAsPackageInfo/RunCMakeTest.cmake

@@ -7,7 +7,7 @@ run_cmake(ExperimentalWarning)
 # Enable experimental feature and suppress warnings
 set(RunCMake_TEST_OPTIONS
   -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=b80be207-778e-46ba-8080-b23bba22639e"
+  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
   "-DCMAKE_EXPERIMENTAL_MAPPED_PACKAGE_INFO:STRING=ababa1b5-7099-495f-a9cd-e22d38f274f2"
   )
 

+ 1 - 1
Tests/RunCMake/InstallPackageInfo/ExperimentalWarning.cmake

@@ -1,6 +1,6 @@
 set(
   CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
-  "b80be207-778e-46ba-8080-b23bba22639e"
+  "7fa7d13b-8308-4dc7-af39-9e450456d68f"
   )
 
 add_library(foo INTERFACE)

+ 1 - 1
Tests/RunCMake/InstallPackageInfo/RunCMakeTest.cmake

@@ -11,7 +11,7 @@ run_cmake(VersionCheckWarning)
 # Enable experimental feature and suppress warnings
 set(RunCMake_TEST_OPTIONS
   -Wno-dev
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=b80be207-778e-46ba-8080-b23bba22639e"
+  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
   "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
   )
 

+ 1 - 1
Tests/RunCMake/InstallPackageInfo/VersionCheckWarning.cmake

@@ -1,6 +1,6 @@
 set(
   CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO
-  "b80be207-778e-46ba-8080-b23bba22639e"
+  "7fa7d13b-8308-4dc7-af39-9e450456d68f"
 )
 
 add_library(foo INTERFACE)

+ 1 - 1
Tests/RunCMake/InstallSbom/RunCMakeTest.cmake

@@ -4,7 +4,7 @@ set(common_test_options
   -Wno-dev
   "-DCMAKE_EXPERIMENTAL_GENERATE_SBOM:STRING=ca494ed3-b261-4205-a01f-603c95e4cae0"
   "-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=b80be207-778e-46ba-8080-b23bba22639e"
+  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO:STRING=7fa7d13b-8308-4dc7-af39-9e450456d68f"
 )
 
 function(run_cmake_install test)

+ 1 - 1
Tests/RunCMake/project/KeywordProjectName.cmake

@@ -3,7 +3,7 @@ project(VERSION)
 project(DESCRIPTION)
 project(HOMEPAGE_URL)
 
-# CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO=b80be207-778e-46ba-8080-b23bba22639e
+# CMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO=7fa7d13b-8308-4dc7-af39-9e450456d68f
 # Enable these when Package Info is no longer experimental
 # project(COMPAT_VERSION)
 # project(SPDX_LICENSE)

+ 1 - 1
Tests/RunCMake/project/RunCMakeTest.cmake

@@ -58,7 +58,7 @@ run_cmake(VersionTwice)
 run_cmake(VersionMax)
 
 set(opts
-  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO=b80be207-778e-46ba-8080-b23bba22639e"
+  "-DCMAKE_EXPERIMENTAL_EXPORT_PACKAGE_INFO=7fa7d13b-8308-4dc7-af39-9e450456d68f"
   "-Wno-dev"
 )