summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-09-13 18:32:58 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-09-13 18:32:58 (GMT)
commit0b29621e6c15ea04b67ea541fb02403b315a770a (patch)
tree2be454c013b1271ee243fd8ee56ad2ebc8843abf
parenta0ec7a00d5fe1a8b65329545f24080af581705be (diff)
parentb7457de4eab41028a625887d27961a96120cfe1d (diff)
downloadCMake-0b29621e6c15ea04b67ea541fb02403b315a770a.zip
CMake-0b29621e6c15ea04b67ea541fb02403b315a770a.tar.gz
CMake-0b29621e6c15ea04b67ea541fb02403b315a770a.tar.bz2
Merge topic 'CPack-DocFix-bug12449'
b7457de CPack fix template too 59204e1 CPack fix #12449 doc mispelled
-rw-r--r--Modules/CPack.cmake2
-rw-r--r--Templates/CPackConfig.cmake.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index d82de93..2cc27cf 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -215,7 +215,7 @@
#
# CPACK_INSTALL_COMMANDS - Extra commands to install components.
#
-# CPACK_INSTALL_DIRECTORIES - Extra directories to install.
+# CPACK_INSTALLED_DIRECTORIES - Extra directories to install.
#
#=============================================================================
diff --git a/Templates/CPackConfig.cmake.in b/Templates/CPackConfig.cmake.in
index 0406392..7150feb 100644
--- a/Templates/CPackConfig.cmake.in
+++ b/Templates/CPackConfig.cmake.in
@@ -5,7 +5,7 @@
# CPACK_INSTALL_CMAKE_PROJECTS - For each project (path, name, component)
# CPACK_CMAKE_GENERATOR - CMake Generator used for the projects
# CPACK_INSTALL_COMMANDS - Extra commands to install components
-# CPACK_INSTALL_DIRECTORIES - Extra directories to install
+# CPACK_INSTALLED_DIRECTORIES - Extra directories to install
# CPACK_PACKAGE_DESCRIPTION_FILE - Description file for the package
# CPACK_PACKAGE_DESCRIPTION_SUMMARY - Summary of the package
# CPACK_PACKAGE_EXECUTABLES - List of pairs of executables and labels