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/CMakePackageConfigHelpers.cmake | 16 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 6 | ||||
| -rw-r--r-- | Utilities/Release/upload_release.cmake | 2 |
5 files changed, 13 insertions, 20 deletions
diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst deleted file mode 100644 index e4cc01e..0000000 --- a/Help/release/dev/0-sample-topic.rst +++ /dev/null @@ -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. diff --git a/Help/release/index.rst b/Help/release/index.rst index 4c9e96a..4b32eab 100644 --- a/Help/release/index.rst +++ b/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 ======== diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake index e37f34f..790d408 100644 --- a/Modules/CMakePackageConfigHelpers.cmake +++ b/Modules/CMakePackageConfigHelpers.cmake @@ -102,13 +102,15 @@ # into the ``FooConfig.cmake`` file. # # ``check_required_components(<package_name>)`` should be called at the end of -# the ``FooConfig.cmake`` file if the package supports components. This macro -# checks whether all requested, non-optional components have been found, and if -# this is not the case, sets the ``Foo_FOUND`` variable to ``FALSE``, so that -# the package is considered to be not found. It does that by testing the -# ``Foo_<Component>_FOUND`` variables for all requested required components. -# When using the ``NO_CHECK_REQUIRED_COMPONENTS_MACRO`` option, this macro is -# not generated into the ``FooConfig.cmake`` file. +# the ``FooConfig.cmake`` file. This macro checks whether all requested, +# non-optional components have been found, and if this is not the case, sets +# the ``Foo_FOUND`` variable to ``FALSE``, so that the package is considered to +# be not found. It does that by testing the ``Foo_<Component>_FOUND`` +# variables for all requested required components. This macro should be +# called even if the package doesn't provide any components to make sure +# users are not specifying components erroneously. When using the +# ``NO_CHECK_REQUIRED_COMPONENTS_MACRO`` option, this macro is not generated +# into the ``FooConfig.cmake`` file. # # For an example see below the documentation for # :command:`write_basic_package_version_file()`. diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8946d67..f27f677 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 11) -set(CMake_VERSION_PATCH 20180605) -#set(CMake_VERSION_RC 1) +set(CMake_VERSION_MINOR 12) +set(CMake_VERSION_PATCH 0) +set(CMake_VERSION_RC 1) diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake index f627966..1edcd65 100644 --- a/Utilities/Release/upload_release.cmake +++ b/Utilities/Release/upload_release.cmake @@ -1,6 +1,6 @@ set(CTEST_RUN_CURRENT_SCRIPT 0) if(NOT VERSION) - set(VERSION 3.11) + set(VERSION 3.12) endif() if(NOT DEFINED PROJECT_PREFIX) set(PROJECT_PREFIX cmake-${VERSION}) |