diff --git a/Help/dev/experimental.rst b/Help/dev/experimental.rst index 1a599104d8..81db8c1358 100644 --- a/Help/dev/experimental.rst +++ b/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 diff --git a/Source/cmExperimental.cxx b/Source/cmExperimental.cxx index a18c4e3aca..db1553ad5f 100644 --- a/Source/cmExperimental.cxx +++ b/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 " diff --git a/Tests/RunCMake/CpsExportImportBuild/RunCMakeTest.cmake b/Tests/RunCMake/CpsExportImportBuild/RunCMakeTest.cmake index e414e7321a..c69ebbd949 100644 --- a/Tests/RunCMake/CpsExportImportBuild/RunCMakeTest.cmake +++ b/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" ) diff --git a/Tests/RunCMake/CpsExportImportInstall/RunCMakeTest.cmake b/Tests/RunCMake/CpsExportImportInstall/RunCMakeTest.cmake index dff26eb741..31d503b22a 100644 --- a/Tests/RunCMake/CpsExportImportInstall/RunCMakeTest.cmake +++ b/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" ) diff --git a/Tests/RunCMake/ExportPackageInfo/ExperimentalWarning.cmake b/Tests/RunCMake/ExportPackageInfo/ExperimentalWarning.cmake index 822a8bbe36..892394ef2e 100644 --- a/Tests/RunCMake/ExportPackageInfo/ExperimentalWarning.cmake +++ b/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) diff --git a/Tests/RunCMake/ExportPackageInfo/RunCMakeTest.cmake b/Tests/RunCMake/ExportPackageInfo/RunCMakeTest.cmake index 5e5c119f88..b06c5453b9 100644 --- a/Tests/RunCMake/ExportPackageInfo/RunCMakeTest.cmake +++ b/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" ) diff --git a/Tests/RunCMake/ExportPackageInfo/VersionCheckWarning.cmake b/Tests/RunCMake/ExportPackageInfo/VersionCheckWarning.cmake index 5a007e3343..df123d2bec 100644 --- a/Tests/RunCMake/ExportPackageInfo/VersionCheckWarning.cmake +++ b/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) diff --git a/Tests/RunCMake/ExportSbom/RunCMakeTest.cmake b/Tests/RunCMake/ExportSbom/RunCMakeTest.cmake index da71c9c2a6..1d81ee65de 100644 --- a/Tests/RunCMake/ExportSbom/RunCMakeTest.cmake +++ b/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) diff --git a/Tests/RunCMake/InstallExportsAsPackageInfo/ExperimentalWarning.cmake b/Tests/RunCMake/InstallExportsAsPackageInfo/ExperimentalWarning.cmake index 22fcb465b3..e2740a827f 100644 --- a/Tests/RunCMake/InstallExportsAsPackageInfo/ExperimentalWarning.cmake +++ b/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 diff --git a/Tests/RunCMake/InstallExportsAsPackageInfo/RunCMakeTest.cmake b/Tests/RunCMake/InstallExportsAsPackageInfo/RunCMakeTest.cmake index 7f35c13204..f77161b03e 100644 --- a/Tests/RunCMake/InstallExportsAsPackageInfo/RunCMakeTest.cmake +++ b/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" ) diff --git a/Tests/RunCMake/InstallPackageInfo/ExperimentalWarning.cmake b/Tests/RunCMake/InstallPackageInfo/ExperimentalWarning.cmake index df6604cd60..3c6b90dc65 100644 --- a/Tests/RunCMake/InstallPackageInfo/ExperimentalWarning.cmake +++ b/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) diff --git a/Tests/RunCMake/InstallPackageInfo/RunCMakeTest.cmake b/Tests/RunCMake/InstallPackageInfo/RunCMakeTest.cmake index 509892fdd7..2f3be0cacd 100644 --- a/Tests/RunCMake/InstallPackageInfo/RunCMakeTest.cmake +++ b/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" ) diff --git a/Tests/RunCMake/InstallPackageInfo/VersionCheckWarning.cmake b/Tests/RunCMake/InstallPackageInfo/VersionCheckWarning.cmake index 3f5fa94d28..833fbbfb71 100644 --- a/Tests/RunCMake/InstallPackageInfo/VersionCheckWarning.cmake +++ b/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) diff --git a/Tests/RunCMake/InstallSbom/RunCMakeTest.cmake b/Tests/RunCMake/InstallSbom/RunCMakeTest.cmake index 9d1dc33e87..525a37155a 100644 --- a/Tests/RunCMake/InstallSbom/RunCMakeTest.cmake +++ b/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) diff --git a/Tests/RunCMake/project/KeywordProjectName.cmake b/Tests/RunCMake/project/KeywordProjectName.cmake index 07a075782b..a8215bc0a6 100644 --- a/Tests/RunCMake/project/KeywordProjectName.cmake +++ b/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) diff --git a/Tests/RunCMake/project/RunCMakeTest.cmake b/Tests/RunCMake/project/RunCMakeTest.cmake index 47e7399d32..9ad4504942 100644 --- a/Tests/RunCMake/project/RunCMakeTest.cmake +++ b/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" )