summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cpack.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-01-05 18:27:48 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-01-05 18:27:48 (GMT)
commitb9c4cff45a8cc24ce4d18ba66d57b713be08ccfc (patch)
tree9c9ca42e1ab79fe3f750e1ee3d7a28b01a732894 /Source/CPack/cpack.cxx
parent17c3a897974556572f0163d52da4fd4ef12b106a (diff)
downloadCMake-b9c4cff45a8cc24ce4d18ba66d57b713be08ccfc.zip
CMake-b9c4cff45a8cc24ce4d18ba66d57b713be08ccfc.tar.gz
CMake-b9c4cff45a8cc24ce4d18ba66d57b713be08ccfc.tar.bz2
ENH: More debugging and work on PackageMaker code
Diffstat (limited to 'Source/CPack/cpack.cxx')
-rw-r--r--Source/CPack/cpack.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 8c0857f..4d35d77 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -282,7 +282,10 @@ int main (int argc, char *argv[])
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Cannot initialize CPack generator: " << generator.c_str() << std::endl);
parsed = 0;
}
- cpackGenerator->Initialize(gen, mf);
+ if ( !cpackGenerator->Initialize(gen, mf) )
+ {
+ parsed = 0;
+ }
if ( parsed && !cpackGenerator->FindRunningCMake(argv[0]) )
{
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Cannot initialize the generator" << std::endl);
@@ -337,7 +340,7 @@ int main (int argc, char *argv[])
int res = cpackGenerator->ProcessGenerator();
if ( !res )
{
- cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Error when generating package: " << cpackProjectName.c_str() << std::endl);
+ cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Error when generating package: " << projName << std::endl);
return 1;
}