Merge branch 'release-4.2'

Help/release/dev/0-sample-topic.rst

@@ -1,7 +0,0 @@
-0-sample-topic
---------------
-
-* This is a sample release note for the change in a topic.
-  Developers should add similar notes for each topic branch
-  making a noteworthy change.  Each document should be named
-  and titled to match the topic name to avoid merge conflicts.

Help/release/index.rst

@@ -7,8 +7,6 @@ CMake Release Notes
   This file should include the adjacent "dev.txt" file
   in development versions but not in release versions.
 
-.. include:: dev.txt
-
 Releases
 ========
 

Source/CMakeVersion.cmake

@@ -1,8 +1,8 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 4)
-set(CMake_VERSION_MINOR 1)
-set(CMake_VERSION_PATCH 20251009)
-#set(CMake_VERSION_RC 0)
+set(CMake_VERSION_MINOR 2)
+set(CMake_VERSION_PATCH 0)
+set(CMake_VERSION_RC 0)
 set(CMake_VERSION_IS_DIRTY 0)
 
 # Start with the full version number used in tags.  It has no dev info.

Source/cmExportCMakeConfigGenerator.cxx

@@ -293,9 +293,7 @@ void cmExportCMakeConfigGenerator::GenerateImportTargetCode(
       break;
     case cmStateEnums::INTERFACE_LIBRARY:
       if (target->IsSymbolic()) {
-        os << "if(CMAKE_VERSION VERSION_GREATER_EQUAL \""
-           << CMake_VERSION_DEVEL(4, 2)
-           << "\")\n"
+        os << "if(CMAKE_VERSION VERSION_GREATER_EQUAL \"4.2.0\")\n"
               "  add_library("
            << targetName << " INTERFACE SYMBOLIC IMPORTED)\n"
            << "elseif(CMAKE_VERSION VERSION_GREATER_EQUAL 3.2.0)\n"