Browse Source

Utilities/Release: Teach upload script to compute version automatically

Read the version from `Source/CMakeVersion.cmake` instead of repeating it.
Brad King 6 years ago
parent
commit
3a0ab3ba23
2 changed files with 2 additions and 7 deletions
  1. 0 6
      Help/dev/maint.rst
  2. 2 1
      Utilities/Release/upload_release.cmake

+ 0 - 6
Help/dev/maint.rst

@@ -188,12 +188,6 @@ Update ``Source/CMakeVersion.cmake`` to set the version to
   set(CMake_VERSION_PATCH 0)
   set(CMake_VERSION_RC 1)
 
-Update ``Utilities/Release/upload_release.cmake``:
-
-.. code-block:: cmake
-
-  set(VERSION $ver)
-
 Update uses of ``DEVEL_CMAKE_VERSION`` in the source tree to mention the
 actual version number:
 

+ 2 - 1
Utilities/Release/upload_release.cmake

@@ -1,6 +1,7 @@
 set(CTEST_RUN_CURRENT_SCRIPT 0)
 if(NOT VERSION)
- set(VERSION 3.14)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../Source/CMakeVersion.cmake)
+  set(VERSION ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR})
 endif()
 if(NOT DEFINED PROJECT_PREFIX)
   set(PROJECT_PREFIX cmake-${VERSION})