Просмотр исходного кода

Merge topic 'rel-doc-qthelp'

1d5c8b81db Utilities/Release: Add qthelp docs to binary archives

Acked-by: Kitware Robot <[email protected]>
Merge-request: !2497
Brad King 7 лет назад
Родитель
Сommit
56c85d9429
2 измененных файлов с 4 добавлено и 1 удалено
  1. 3 0
      Help/release/3.13.rst
  2. 1 1
      Utilities/Release/create-cmake-release.cmake

+ 3 - 0
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.

+ 1 - 1
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} ||