diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-17 18:59:12 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-18 11:39:07 (GMT) |
| commit | 2646fd8e03869e2254514f43b0c2a07d89c26076 (patch) | |
| tree | 7a7e4a5ca9092532b0d98184f2005937fcbc0f25 | |
| parent | fc675057e4b2135e8381e7ae45801e64c4767e75 (diff) | |
| parent | 1d5c8b81db1cbba79927cc251421b2786ce02866 (diff) | |
| download | CMake-2646fd8e03869e2254514f43b0c2a07d89c26076.zip CMake-2646fd8e03869e2254514f43b0c2a07d89c26076.tar.gz CMake-2646fd8e03869e2254514f43b0c2a07d89c26076.tar.bz2 | |
Merge branch 'rel-doc-qthelp' into release-3.13
Merge-request: !2497
| -rw-r--r-- | Help/release/3.13.rst | 3 | ||||
| -rw-r--r-- | Utilities/Release/create-cmake-release.cmake | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Help/release/3.13.rst b/Help/release/3.13.rst index ed5f17f..f547556 100644 --- a/Help/release/3.13.rst +++ b/Help/release/3.13.rst @@ -204,6 +204,9 @@ Deprecated and Removed Features Other Changes ============= +* The precompiled binaries provided on ``cmake.org`` now include + qthelp-format documentation. + * The :command:`option` command now honors an existing normal variable of the same name and does nothing instead of possibly creating a cache entry (or setting its type) and removing the normal variable. diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake index 3af1b03..b3cc352 100644 --- a/Utilities/Release/create-cmake-release.cmake +++ b/Utilities/Release/create-cmake-release.cmake @@ -54,7 +54,7 @@ cd \${name}-build && -DCMAKE_INSTALL_PREFIX=\"\$inst/\" \\ -DCMAKE_DOC_DIR=doc/cmake \\ -DSPHINX_EXECUTABLE=\"${SPHINX_EXECUTABLE}\" \\ - -DSPHINX_HTML=ON -DSPHINX_MAN=ON && + -DSPHINX_HTML=ON -DSPHINX_MAN=ON -DSPHINX_QTHELP=ON && make install && cd .. && tar czf \${name}.tar.gz \${name} || |