diff options
author | Eric NOULARD <eric.noulard@gmail.com> | 2012-02-05 12:13:48 (GMT) |
---|---|---|
committer | Eric NOULARD <eric.noulard@gmail.com> | 2012-02-05 12:13:48 (GMT) |
commit | 6a74eb1d36b079fe6b566244a636ac1e43303aa6 (patch) | |
tree | 051e91efb703da8c03511cc906d36ae10aa194b3 /Source/CPack | |
parent | 34cc537132e843d07c3bdeb0ccaa06e82f9aef88 (diff) | |
download | CMake-6a74eb1d36b079fe6b566244a636ac1e43303aa6.zip CMake-6a74eb1d36b079fe6b566244a636ac1e43303aa6.tar.gz CMake-6a74eb1d36b079fe6b566244a636ac1e43303aa6.tar.bz2 |
CPackNSIS fix #0012935 switch from LOG_WARNING to avoid final error.
Diffstat (limited to 'Source/CPack')
-rw-r--r-- | Source/CPack/cmCPackNSISGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 2b94067..0787ef9 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -344,9 +344,9 @@ int cmCPackNSISGenerator::InitializeInternal() if ( cmSystemTools::IsOn(this->GetOption( "CPACK_INCLUDE_TOPLEVEL_DIRECTORY")) ) { - cmCPackLogger(cmCPackLog::LOG_ERROR, - "NSIS Generator cannot work with CPACK_INCLUDE_TOPLEVEL_DIRECTORY. " - "This option will be ignored." + cmCPackLogger(cmCPackLog::LOG_WARNING, + "NSIS Generator cannot work with CPACK_INCLUDE_TOPLEVEL_DIRECTORY set. " + "This option will be reset to 0 (for this generator only)." << std::endl); this->SetOption("CPACK_INCLUDE_TOPLEVEL_DIRECTORY", 0); } |