diff options
| -rw-r--r-- | Help/release/dev/0-sample-topic.rst | 7 | ||||
| -rw-r--r-- | Help/release/index.rst | 2 | ||||
| -rw-r--r-- | Modules/FindEnvModules.cmake | 6 | ||||
| -rw-r--r-- | Modules/Internal/CPack/CPackNuGet.cmake | 2 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 4 |
5 files changed, 15 insertions, 6 deletions
diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst new file mode 100644 index 0000000..e4cc01e --- /dev/null +++ b/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. diff --git a/Help/release/index.rst b/Help/release/index.rst index 35a47aa..62032e6 100644 --- a/Help/release/index.rst +++ b/Help/release/index.rst @@ -7,6 +7,8 @@ CMake Release Notes This file should include the adjacent "dev.txt" file in development versions but not in release versions. +.. include:: dev.txt + Releases ======== diff --git a/Modules/FindEnvModules.cmake b/Modules/FindEnvModules.cmake index e39ec97..4dd5116 100644 --- a/Modules/FindEnvModules.cmake +++ b/Modules/FindEnvModules.cmake @@ -53,7 +53,7 @@ Result Variables This module will set the following variables in your project: ``EnvModules_FOUND`` - Found the a compatible environment modules framework + True if a compatible environment modules framework was found. Cache Variables ^^^^^^^^^^^^^^^ @@ -61,7 +61,7 @@ Cache Variables The following cache variable will be set: ``EnvModules_COMMAND`` - The low level module command to use. Currently supported are + The low level module command to use. Currently supported implementations are the Lua based Lmod and TCL based EnvironmentModules. Environment Variables @@ -74,7 +74,7 @@ Environment Variables Provided Functions ^^^^^^^^^^^^^^^^^^ -This defines the following cmake functions for interacting with environment +This defines the following CMake functions for interacting with environment modules: .. command:: env_module diff --git a/Modules/Internal/CPack/CPackNuGet.cmake b/Modules/Internal/CPack/CPackNuGet.cmake index 198ccad..4b2ce92 100644 --- a/Modules/Internal/CPack/CPackNuGet.cmake +++ b/Modules/Internal/CPack/CPackNuGet.cmake @@ -276,7 +276,7 @@ function(_cpack_nuget_make_files_tag) set(_CPACK_NUGET_FILES_TAG "<files>\n${_files} </files>" PARENT_SCOPE) endfunction() -find_program(NUGET_EXECUTABLE NuGet) +find_program(NUGET_EXECUTABLE nuget) _cpack_nuget_debug_var(NUGET_EXECUTABLE) if(NOT NUGET_EXECUTABLE) message(FATAL_ERROR "NuGet executable not found") diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e22d37c..381fbe3 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 15) -set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 1) +set(CMake_VERSION_PATCH 20190606) +#set(CMake_VERSION_RC 1) |