Browse Source

Begin post-4.1 development

Brad King 4 months ago
parent
commit
7b4a7a91eb

+ 2 - 2
Help/manual/cmake-policies.7.rst

@@ -34,10 +34,10 @@ For example:
 
 
 .. code-block:: cmake
 .. code-block:: cmake
 
 
-  cmake_minimum_required(VERSION 3.10...4.0)
+  cmake_minimum_required(VERSION 3.10...4.1)
 
 
 This uses the ``<min>...<max>`` syntax to enable the ``NEW`` behaviors
 This uses the ``<min>...<max>`` syntax to enable the ``NEW`` behaviors
-of policies introduced in CMake 4.0 and earlier while only requiring a
+of policies introduced in CMake 4.1 and earlier while only requiring a
 minimum version of CMake 3.10.  The project is expected to work with
 minimum version of CMake 3.10.  The project is expected to work with
 both the ``OLD`` and ``NEW`` behaviors of policies introduced between
 both the ``OLD`` and ``NEW`` behaviors of policies introduced between
 those versions.
 those versions.

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

@@ -0,0 +1,7 @@
+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.

+ 2 - 0
Help/release/index.rst

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

+ 2 - 2
Source/CMakeVersion.cmake

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