diff options
| author | Eric NOULARD <eric.noulard@gmail.com> | 2012-02-07 15:59:04 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2012-02-14 21:05:24 (GMT) |
| commit | d4b77eba17e01badc836777dbb0c9ec287f098aa (patch) | |
| tree | c917cdda6d9715e45c6f9b0864afb4cb5b1afe44 /Source | |
| parent | 9002f73f311893be20d8d986de8e5239ed2afce2 (diff) | |
| download | CMake-d4b77eba17e01badc836777dbb0c9ec287f098aa.zip CMake-d4b77eba17e01badc836777dbb0c9ec287f098aa.tar.gz CMake-d4b77eba17e01badc836777dbb0c9ec287f098aa.tar.bz2 | |
Avoid discovering system infos for documentation. Adding some path is enough.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cpack.cxx | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 3182915..c541610 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -304,30 +304,31 @@ int main (int argc, char *argv[]) help = false; } - // find out which system cpack is running on, so it can setup the search - // paths, so FIND_XXX() commands can be used in scripts // This part is used for cpack documentation lookup as well. cminst.AddCMakePaths(); - std::string systemFile = - globalMF->GetModulesFile("CMakeDetermineSystem.cmake"); - if (!globalMF->ReadListFile(0, systemFile.c_str())) - { - cmCPack_Log(&log, cmCPackLog::LOG_ERROR, - "Error reading CMakeDetermineSystem.cmake" << std::endl); - return 1; - } - - systemFile = - globalMF->GetModulesFile("CMakeSystemSpecificInformation.cmake"); - if (!globalMF->ReadListFile(0, systemFile.c_str())) - { - cmCPack_Log(&log, cmCPackLog::LOG_ERROR, - "Error reading CMakeSystemSpecificInformation.cmake" << std::endl); - return 1; - } if ( parsed && !help ) { + // find out which system cpack is running on, so it can setup the search + // paths, so FIND_XXX() commands can be used in scripts + std::string systemFile = + globalMF->GetModulesFile("CMakeDetermineSystem.cmake"); + if (!globalMF->ReadListFile(0, systemFile.c_str())) + { + cmCPack_Log(&log, cmCPackLog::LOG_ERROR, + "Error reading CMakeDetermineSystem.cmake" << std::endl); + return 1; + } + + systemFile = + globalMF->GetModulesFile("CMakeSystemSpecificInformation.cmake"); + if (!globalMF->ReadListFile(0, systemFile.c_str())) + { + cmCPack_Log(&log, cmCPackLog::LOG_ERROR, + "Error reading CMakeSystemSpecificInformation.cmake" << std::endl); + return 1; + } + if ( cmSystemTools::FileExists(cpackConfigFile.c_str()) ) { cpackConfigFile = |