kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'CPackNSIS-fixIgnore-INCLUDE_TOPLEVEL' 

6a74eb1 CPackNSIS fix #0012935 switch from LOG_WARNING to avoid final error.
This commit is contained in:
David Cole 2012-02-14 16:14:45 -05:00 committed by CMake Topic Stage
parent e65f39a59e 6a74eb1d36
commit 4f81c709d1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CPack/cmCPackNSISGenerator.cxx
View File

@ -344,9 +344,9 @@ int cmCPackNSISGenerator::InitializeInternal()
if ( cmSystemTools::IsOn(this->GetOption( if ( cmSystemTools::IsOn(this->GetOption(
"CPACK_INCLUDE_TOPLEVEL_DIRECTORY")) ) "CPACK_INCLUDE_TOPLEVEL_DIRECTORY")) )
{ {
cmCPackLogger(cmCPackLog::LOG_ERROR, cmCPackLogger(cmCPackLog::LOG_WARNING,
"NSIS Generator cannot work with CPACK_INCLUDE_TOPLEVEL_DIRECTORY. " "NSIS Generator cannot work with CPACK_INCLUDE_TOPLEVEL_DIRECTORY set. "
"This option will be ignored." "This option will be reset to 0 (for this generator only)."
<< std::endl); << std::endl);
this->SetOption("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", 0); this->SetOption("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", 0);
} }