diff --git a/Help/dev/experimental.rst b/Help/dev/experimental.rst index f5e4bd4643..f9334860f6 100644 --- a/Help/dev/experimental.rst +++ b/Help/dev/experimental.rst @@ -127,15 +127,15 @@ In order to activate support for the :command:`cmake_instrumentation` command, set * variable ``CMAKE_EXPERIMENTAL_INSTRUMENTATION`` to -* value ``d16a3082-c4e1-489b-b90c-55750a334f27``. +* value ``f4f3d5ea-0915-470f-9628-4615e72f738a``. To enable instrumentation at the user-level, files should be placed under either -``/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27`` or -``/.cmake/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27``. +``/instrumentation-f4f3d5ea-0915-470f-9628-4615e72f738a`` or +``/.cmake/instrumentation-f4f3d5ea-0915-470f-9628-4615e72f738a``. To include instrumentation data in CTest XML files (for submission to CDash), you need to set the following environment variables: * ``CTEST_USE_INSTRUMENTATION=1`` -* ``CTEST_EXPERIMENTAL_INSTRUMENTATION=d16a3082-c4e1-489b-b90c-55750a334f27`` +* ``CTEST_EXPERIMENTAL_INSTRUMENTATION=f4f3d5ea-0915-470f-9628-4615e72f738a`` diff --git a/Source/cmExperimental.cxx b/Source/cmExperimental.cxx index 167b99c689..70bb59afed 100644 --- a/Source/cmExperimental.cxx +++ b/Source/cmExperimental.cxx @@ -65,7 +65,7 @@ cmExperimental::FeatureData const LookupTable[] = { cmExperimental::TryCompileCondition::Never }, // Instrumentation { "Instrumentation", - "d16a3082-c4e1-489b-b90c-55750a334f27", + "f4f3d5ea-0915-470f-9628-4615e72f738a", "CMAKE_EXPERIMENTAL_INSTRUMENTATION", "CMake's support for collecting instrumentation data is experimental. It " "is meant only for experimentation and feedback to CMake developers.", diff --git a/Tests/RunCMake/ConfigDir/check-reply.cmake b/Tests/RunCMake/ConfigDir/check-reply.cmake index 26c5022614..d2292b8378 100644 --- a/Tests/RunCMake/ConfigDir/check-reply.cmake +++ b/Tests/RunCMake/ConfigDir/check-reply.cmake @@ -1,6 +1,6 @@ if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/api/v1/reply) set(RunCMake_TEST_FAILED "Failed to read FileAPI query from user config directory") endif() -if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27/v1/data) +if (NOT EXISTS ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-f4f3d5ea-0915-470f-9628-4615e72f738a/v1/data) set(RunCMake_TEST_FAILED "Failed to read Instrumentation query from user config directory") endif() diff --git a/Tests/RunCMake/ConfigDir/config/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27/v1/query/query.json b/Tests/RunCMake/ConfigDir/config/instrumentation-f4f3d5ea-0915-470f-9628-4615e72f738a/v1/query/query.json similarity index 100% rename from Tests/RunCMake/ConfigDir/config/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27/v1/query/query.json rename to Tests/RunCMake/ConfigDir/config/instrumentation-f4f3d5ea-0915-470f-9628-4615e72f738a/v1/query/query.json diff --git a/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake b/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake index d7e6c39bbd..368a9f5660 100644 --- a/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake +++ b/Tests/RunCMake/Instrumentation/RunCMakeTest.cmake @@ -23,7 +23,7 @@ function(instrument test) ) cmake_parse_arguments(ARGS "${OPTIONS}" "CHECK_SCRIPT;CONFIGURE_ARG" "" ${ARGN}) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${test}) - set(uuid "d16a3082-c4e1-489b-b90c-55750a334f27") + set(uuid "f4f3d5ea-0915-470f-9628-4615e72f738a") set(v1 ${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-${uuid}/v1) set(query_dir ${CMAKE_CURRENT_LIST_DIR}/query) diff --git a/Tests/RunCMake/Instrumentation/project/CMakeLists.txt b/Tests/RunCMake/Instrumentation/project/CMakeLists.txt index a6fa16bd32..80c8f43113 100644 --- a/Tests/RunCMake/Instrumentation/project/CMakeLists.txt +++ b/Tests/RunCMake/Instrumentation/project/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.30) project(instrumentation) enable_testing() if (EXISTS ${INSTRUMENT_COMMAND_FILE}) - set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "d16a3082-c4e1-489b-b90c-55750a334f27") + set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "f4f3d5ea-0915-470f-9628-4615e72f738a") include(${INSTRUMENT_COMMAND_FILE}) endif() diff --git a/Tests/RunCMake/ctest_instrumentation/CMakeLists.txt.in b/Tests/RunCMake/ctest_instrumentation/CMakeLists.txt.in index 06034f4bc8..8195c33240 100644 --- a/Tests/RunCMake/ctest_instrumentation/CMakeLists.txt.in +++ b/Tests/RunCMake/ctest_instrumentation/CMakeLists.txt.in @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) @CASE_CMAKELISTS_PREFIX_CODE@ project(CTestInstrumentation@CASE_NAME@) if(USE_INSTRUMENTATION) - set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "d16a3082-c4e1-489b-b90c-55750a334f27") + set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "f4f3d5ea-0915-470f-9628-4615e72f738a") endif() include(CTest) add_executable(main main.c) diff --git a/Tests/RunCMake/ctest_instrumentation/InstrumentationInCTestXML-check.cmake b/Tests/RunCMake/ctest_instrumentation/InstrumentationInCTestXML-check.cmake index 0f80214a5f..315e6e0676 100644 --- a/Tests/RunCMake/ctest_instrumentation/InstrumentationInCTestXML-check.cmake +++ b/Tests/RunCMake/ctest_instrumentation/InstrumentationInCTestXML-check.cmake @@ -1,4 +1,4 @@ -set(timingDir "${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-d16a3082-c4e1-489b-b90c-55750a334f27/v1") +set(timingDir "${RunCMake_TEST_BINARY_DIR}/.cmake/instrumentation-f4f3d5ea-0915-470f-9628-4615e72f738a/v1") file(READ "${timingDir}/query/generated/query-0.json" jsonData) string(JSON options GET "${jsonData}" options) if (options MATCHES cdashVerbose AND NOT ${RunCMake_USE_VERBOSE_INSTRUMENTATION}) diff --git a/Tests/RunCMake/ctest_instrumentation/RunCMakeTest.cmake b/Tests/RunCMake/ctest_instrumentation/RunCMakeTest.cmake index c902c8a650..3b30ec60e2 100644 --- a/Tests/RunCMake/ctest_instrumentation/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_instrumentation/RunCMakeTest.cmake @@ -10,7 +10,7 @@ function(run_InstrumentationInCTestXML CASE_NAME) set(RunCMake_USE_VERBOSE_INSTRUMENTATION FALSE) endif() if(ARGS_USE_INSTRUMENTATION_ENV_VARS) - set(ENV{CTEST_EXPERIMENTAL_INSTRUMENTATION} "d16a3082-c4e1-489b-b90c-55750a334f27") + set(ENV{CTEST_EXPERIMENTAL_INSTRUMENTATION} "f4f3d5ea-0915-470f-9628-4615e72f738a") set(ENV{CTEST_USE_INSTRUMENTATION} "1") set(RunCMake_USE_INSTRUMENTATION TRUE) else() diff --git a/Tests/RunCMake/ctest_labels_for_subprojects/RunCMakeTest.cmake b/Tests/RunCMake/ctest_labels_for_subprojects/RunCMakeTest.cmake index 4149cdb20b..82904cd727 100644 --- a/Tests/RunCMake/ctest_labels_for_subprojects/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_labels_for_subprojects/RunCMakeTest.cmake @@ -38,7 +38,7 @@ file(COPY "${CTEST_RUNCMAKE_SOURCE_DIRECTORY}/MyThirdPartyDependency" if(USE_INSTRUMENTATION) set(CASE_CMAKELISTS_SUFFIX_CODE [[ add_subdirectory(MyThirdPartyDependency) - set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "d16a3082-c4e1-489b-b90c-55750a334f27") + set(CMAKE_EXPERIMENTAL_INSTRUMENTATION "f4f3d5ea-0915-470f-9628-4615e72f738a") cmake_instrumentation(DATA_VERSION 1 API_VERSION 1) ]]) set(RunCMake-check-file CTestScriptVariableCommandLine-check.cmake)