summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-01-09 14:37:58 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-01-09 14:38:02 (GMT)
commitae89a6e110badd54c1aa8a2957f15e260224c7df (patch)
treec80dccd2d2398f917503bfdc893476e550b25c6b
parent1906dd3e3d63b18784e551cb3c21b02a073dab34 (diff)
parente41536405884fc3d6342748a20cc3f391d4a3221 (diff)
downloadCMake-ae89a6e110badd54c1aa8a2957f15e260224c7df.zip
CMake-ae89a6e110badd54c1aa8a2957f15e260224c7df.tar.gz
CMake-ae89a6e110badd54c1aa8a2957f15e260224c7df.tar.bz2
Merge topic 'cpack_versions'
e4153640 Cpack.cmake: Document some CPACK_* default values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1608
-rw-r--r--Modules/CPack.cmake11
1 files changed, 6 insertions, 5 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 812917f..9216fc9 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -68,7 +68,7 @@
#
# .. variable:: CPACK_PACKAGE_VENDOR
#
-# The name of the package vendor. (e.g., "Kitware").
+# The name of the package vendor. (e.g., "Kitware"). Default is "Humanity".
#
# .. variable:: CPACK_PACKAGE_DIRECTORY
#
@@ -80,15 +80,15 @@
#
# .. variable:: CPACK_PACKAGE_VERSION_MAJOR
#
-# Package major Version
+# Package major Version. Default value is 0.
#
# .. variable:: CPACK_PACKAGE_VERSION_MINOR
#
-# Package minor Version
+# Package minor Version. Default value is 1.
#
# .. variable:: CPACK_PACKAGE_VERSION_PATCH
#
-# Package patch Version
+# Package patch Version. Default value is 1.
#
# .. variable:: CPACK_PACKAGE_DESCRIPTION_FILE
#
@@ -262,7 +262,8 @@
#
# .. variable:: CPACK_SYSTEM_NAME
#
-# System name, defaults to the value of ${CMAKE_SYSTEM_NAME}.
+# System name, defaults to the value of ${CMAKE_SYSTEM_NAME}, except on
+# Windows where it will be "win32" or "win64".
#
# .. variable:: CPACK_PACKAGE_VERSION
#