diff options
| author | David Cole <david.cole@kitware.com> | 2012-02-14 21:14:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-02-14 21:14:45 (GMT) |
| commit | 4f81c709d1c5f9d2ea9bea0b7d2a1cdee9a33f7e (patch) | |
| tree | 121fb5cb017d630dde23e364a5d5f0381c914efb /Source/CPack | |
| parent | e65f39a59ed45ceb3f0be7f69d26c64677d599cd (diff) | |
| parent | 6a74eb1d36b079fe6b566244a636ac1e43303aa6 (diff) | |
| download | CMake-4f81c709d1c5f9d2ea9bea0b7d2a1cdee9a33f7e.zip CMake-4f81c709d1c5f9d2ea9bea0b7d2a1cdee9a33f7e.tar.gz CMake-4f81c709d1c5f9d2ea9bea0b7d2a1cdee9a33f7e.tar.bz2 | |
Merge topic 'CPackNSIS-fixIgnore-INCLUDE_TOPLEVEL'
6a74eb1 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); } |