diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-07 20:11:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-07 20:11:33 (GMT) |
| commit | bfd65c11817bb1aeedeea68adf45c9325125755c (patch) | |
| tree | 613d0f00b76fe9557ca657e188526285eaeea542 | |
| parent | 16613bc05074e6c895f6b86567f5c92111346d62 (diff) | |
| parent | 638fa41234fe2935a471377f8493718cd92f42c1 (diff) | |
| download | CMake-bfd65c11817bb1aeedeea68adf45c9325125755c.zip CMake-bfd65c11817bb1aeedeea68adf45c9325125755c.tar.gz CMake-bfd65c11817bb1aeedeea68adf45c9325125755c.tar.bz2 | |
Merge branch 'apple-asm-deployment-target' into release-3.16
Merge-request: !3894
| -rw-r--r-- | Help/release/dev/0-sample-topic.rst | 7 | ||||
| -rw-r--r-- | Help/release/index.rst | 2 | ||||
| -rw-r--r-- | Modules/Platform/Apple-Clang-ASM.cmake | 2 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 4 |
4 files changed, 13 insertions, 2 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 0cc3f97..a4585a5 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/Platform/Apple-Clang-ASM.cmake b/Modules/Platform/Apple-Clang-ASM.cmake new file mode 100644 index 0000000..935cce9 --- /dev/null +++ b/Modules/Platform/Apple-Clang-ASM.cmake @@ -0,0 +1,2 @@ +include(Platform/Apple-Clang) +__apple_compiler_clang(ASM) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 51a9217..c068594 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,8 +1,8 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 0) +set(CMake_VERSION_PATCH 20191007) +#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. |