summaryrefslogtreecommitdiffstats
path: root/Help/manual
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-06-22 13:47:47 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-06-22 13:48:00 (GMT)
commit44ca3d922cc1da390eaea3673a025a9b96556afc (patch)
treed99fd257c73f63d9ac07aa228102011813df259c /Help/manual
parent5e1f5190377d6c2eed1e0cdbf57f51d3aa6a4717 (diff)
parent57e4c51e8a891615ac53dcaf6f087af352d24ff6 (diff)
downloadCMake-44ca3d922cc1da390eaea3673a025a9b96556afc.zip
CMake-44ca3d922cc1da390eaea3673a025a9b96556afc.tar.gz
CMake-44ca3d922cc1da390eaea3673a025a9b96556afc.tar.bz2
Merge topic 'cpack-generator-documentation'
57e4c51e8a Help: Update old version release notes for CPack generator docs 4181830881 Help: Add release notes for CPack generator documentation and module updates 48bc8b2b82 CPack: Move internal implementation modules into Internal/CPack directory 2a2829cc75 Help: Add new section for CPack generators be6267808a CPackIFW: Turn documentation into a block comment 0180524c7a Help: Move legacy CPack modules into separate section Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2149
Diffstat (limited to 'Help/manual')
-rw-r--r--Help/manual/cmake-modules.7.rst35
-rw-r--r--Help/manual/cpack-generators.7.rst28
2 files changed, 51 insertions, 12 deletions
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 8ef4d7d..b7276b6 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -54,22 +54,10 @@ All Modules
/module/CMakePrintSystemInformation
/module/CMakePushCheckState
/module/CMakeVerifyManifest
- /module/CPackArchive
- /module/CPackBundle
/module/CPackComponent
- /module/CPackCygwin
- /module/CPackDeb
- /module/CPackDMG
- /module/CPackFreeBSD
/module/CPackIFW
/module/CPackIFWConfigureFile
- /module/CPackNSIS
- /module/CPackNuGet
- /module/CPackPackageMaker
- /module/CPackProductBuild
- /module/CPackRPM
/module/CPack
- /module/CPackWIX
/module/CSharpUtilities
/module/CTest
/module/CTestCoverageCollectGCOV
@@ -263,3 +251,26 @@ All Modules
/module/Use_wxWindows
/module/WriteBasicConfigVersionFile
/module/WriteCompilerDetectionHeader
+
+Legacy CPack Modules
+====================
+
+These modules used to be mistakenly exposed to the user, and have been moved
+out of user visibility. They are for CPack internal use, and should never be
+used directly.
+
+.. toctree::
+ :maxdepth: 1
+
+ /module/CPackArchive
+ /module/CPackBundle
+ /module/CPackCygwin
+ /module/CPackDeb
+ /module/CPackDMG
+ /module/CPackFreeBSD
+ /module/CPackNSIS
+ /module/CPackNuGet
+ /module/CPackPackageMaker
+ /module/CPackProductBuild
+ /module/CPackRPM
+ /module/CPackWIX
diff --git a/Help/manual/cpack-generators.7.rst b/Help/manual/cpack-generators.7.rst
new file mode 100644
index 0000000..4614b1c
--- /dev/null
+++ b/Help/manual/cpack-generators.7.rst
@@ -0,0 +1,28 @@
+.. cmake-manual-description: CPack Generator Reference
+
+cpack-generators(7)
+*******************
+
+.. only:: html
+
+ .. contents::
+
+Generators
+==========
+
+.. toctree::
+ :maxdepth: 1
+
+ /cpack_gen/archive
+ /cpack_gen/bundle
+ /cpack_gen/cygwin
+ /cpack_gen/deb
+ /cpack_gen/dmg
+ /cpack_gen/freebsd
+ /cpack_gen/ifw
+ /cpack_gen/nsis
+ /cpack_gen/nuget
+ /cpack_gen/packagemaker
+ /cpack_gen/productbuild
+ /cpack_gen/rpm
+ /cpack_gen/wix