summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-05-29 19:37:35 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-05-29 19:37:35 (GMT)
commit932ea59d51f36966726fe2d657e28f66bf977315 (patch)
treee952646786accda0a4d7187c5d2af0237c44ad72
parent28ce13f2fbf6227ec0b27e500654ccf2bad0c111 (diff)
parentcfc11f9bff95c8332b31741056481d24e0db83f6 (diff)
downloadCMake-932ea59d51f36966726fe2d657e28f66bf977315.zip
CMake-932ea59d51f36966726fe2d657e28f66bf977315.tar.gz
CMake-932ea59d51f36966726fe2d657e28f66bf977315.tar.bz2
Merge topic 'cpack-nsis-menu-links-adapted'
cfc11f9 CPack: Fixed incorrect error log for CPACK_NSIS_MENU_LINKS.
-rw-r--r--Source/CPack/cmCPackNSISGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 481fd2b..7b52511 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -543,8 +543,8 @@ void cmCPackNSISGenerator::CreateMenuLinks( cmOStringStream& str,
{
cmCPackLogger(
cmCPackLog::LOG_ERROR,
- "CPACK_PACKAGE_EXECUTABLES should contain pairs of <executable> and "
- "<icon name>." << std::endl);
+ "CPACK_NSIS_MENU_LINKS should contain pairs of <shortcut target> and "
+ "<shortcut label>." << std::endl);
return;
}