diff options
| author | Eric NOULARD <eric.noulard@gmail.com> | 2011-03-19 10:12:31 (GMT) |
|---|---|---|
| committer | Eric NOULARD <eric.noulard@gmail.com> | 2011-03-19 10:12:31 (GMT) |
| commit | 21007f898952d74a4db38a9259d946c7d9a06eb3 (patch) | |
| tree | 9892355e3fceaecb735fb722904a2691df39a27b /Source/CPack | |
| parent | 96453cea6ae9d41e83d8148539acc614e6316abd (diff) | |
| download | CMake-21007f898952d74a4db38a9259d946c7d9a06eb3.zip CMake-21007f898952d74a4db38a9259d946c7d9a06eb3.tar.gz CMake-21007f898952d74a4db38a9259d946c7d9a06eb3.tar.bz2 | |
CPack fix CPackDeb crash when CPackDeb.cmake ends with a FATAL_ERROR
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 13 | ||||
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 6 |
2 files changed, 14 insertions, 5 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index d3320c0..ca2185c 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -96,6 +96,7 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup) cmCPackLogger(cmCPackLog::LOG_ERROR, "Error while execution CPackDeb.cmake" << std::endl); retval = 0; + return retval; } cmsys::Glob gl; @@ -105,7 +106,7 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup) if ( !gl.FindFiles(findExpr) ) { cmCPackLogger(cmCPackLog::LOG_ERROR, - "Cannot find any files in the installed directory" << std::endl); + "Cannot find any files in the installed directory" << std::endl); return 0; } packageFiles = gl.GetFiles(); @@ -152,8 +153,8 @@ int cmCPackDebGenerator::PackageComponents(bool ignoreGroup) cmCPackLogger(cmCPackLog::LOG_ERROR, "Error while execution CPackDeb.cmake" << std::endl); retval = 0; + return retval; } - cmsys::Glob gl; std::string findExpr(this->GetOption("WDIR")); findExpr += "/*"; @@ -230,6 +231,7 @@ int cmCPackDebGenerator::PackageComponentsAllInOne(bool allComponent) cmCPackLogger(cmCPackLog::LOG_ERROR, "Error while execution CPackDeb.cmake" << std::endl); retval = 0; + return retval; } cmsys::Glob gl; @@ -288,8 +290,11 @@ int cmCPackDebGenerator::PackageFiles() "Error while execution CPackDeb.cmake" << std::endl); retval = 0; } - packageFiles = files; - return createDeb(); + else + { + packageFiles = files; + return createDeb(); + } } return retval; } diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 5f314c6..c343acf 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -885,8 +885,12 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( //---------------------------------------------------------------------- bool cmCPackGenerator::ReadListFile(const char* moduleName) { + bool retval; std::string fullPath = this->MakefileMap->GetModulesFile(moduleName); - return this->MakefileMap->ReadListFile(0, fullPath.c_str()); + retval = this->MakefileMap->ReadListFile(0, fullPath.c_str()); + // include FATAL_ERROR and ERROR in the return status + retval = retval && (! cmSystemTools::GetErrorOccuredFlag()); + return retval; } //---------------------------------------------------------------------- |