[Cmake-commits] CMake branch, master, updated. v3.13.0-rc2-317-gaa78b61
Kitware Robot
kwrobot at kitware.com
Sun Nov 4 20:05:04 EST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via aa78b61bbcc346e602f7f982ecb8ac8f8e72623d (commit)
via c12eefa8fdad306f938b7858168b3e65cd9740d6 (commit)
from 112100da9033fdf678e83ac65580dc456b83a2cb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa78b61bbcc346e602f7f982ecb8ac8f8e72623d
commit aa78b61bbcc346e602f7f982ecb8ac8f8e72623d
Merge: 112100d c12eefa
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Mon Nov 5 01:00:26 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Sun Nov 4 20:01:08 2018 -0500
Merge topic 'cpack-gen-docs-link'
c12eefa8fd Help: Fix generators link in cpack(1) manual
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2562
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c12eefa8fdad306f938b7858168b3e65cd9740d6
commit c12eefa8fdad306f938b7858168b3e65cd9740d6
Author: Craig Scott <craig.scott at crascit.com>
AuthorDate: Sun Nov 4 08:50:22 2018 +1100
Commit: Craig Scott <craig.scott at crascit.com>
CommitDate: Sun Nov 4 08:50:22 2018 +1100
Help: Fix generators link in cpack(1) manual
Minor rewording around the updated link and extra blank line
added to improve readability and remove a potential
ambiguity around the same area.
Fixes: #18545
diff --git a/Help/manual/cpack.1.rst b/Help/manual/cpack.1.rst
index 87aa38d..6159d7b 100644
--- a/Help/manual/cpack.1.rst
+++ b/Help/manual/cpack.1.rst
@@ -29,9 +29,10 @@ Options
package(s) in that generator's format according to the details provided in
the ``CPackConfig.cmake`` configuration file. A generator is responsible for
generating the required inputs for a particular package system and invoking
- that system's package creation tools. Possible generator names are specified
- in the :manual:`Generators <cmake-generators(7)>` section of the manual and
+ that system's package creation tools. All supported generators are specified
+ in the :manual:`Generators <cpack-generators(7)>` section of the manual and
the ``--help`` option lists the generators supported for the target platform.
+
If this option is not given, the :variable:`CPACK_GENERATOR` variable
determines the default set of generators that will be used.
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cpack.1.rst | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list