summaryrefslogtreecommitdiffstats
path: root/Source/CPack/cpack.cxx
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2006-02-23 14:59:42 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2006-02-23 14:59:42 (GMT)
commit2e19553e7cc899013bbc2cf527a9cb83cb655148 (patch)
treee29c9fd9daa9110832a03e8b35a2941dfcf0e1a6 /Source/CPack/cpack.cxx
parent01a55559dd8ed40ea88582b49b9e94136fd7613a (diff)
downloadCMake-2e19553e7cc899013bbc2cf527a9cb83cb655148.zip
CMake-2e19553e7cc899013bbc2cf527a9cb83cb655148.tar.gz
CMake-2e19553e7cc899013bbc2cf527a9cb83cb655148.tar.bz2
ENH: Allow running without config file
Diffstat (limited to 'Source/CPack/cpack.cxx')
-rw-r--r--Source/CPack/cpack.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index c35efbe..c85131b 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -234,10 +234,13 @@ int main (int argc, char *argv[])
if ( parsed && !help )
{
- if ( cmSystemTools::FileExists(cpackConfigFile.c_str()) && !mf->ReadListFile(0, cpackConfigFile.c_str()) )
+ if ( cmSystemTools::FileExists(cpackConfigFile.c_str()) )
{
- cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Problem reding CPack config file: \"" << cpackConfigFile.c_str() << "\"" << std::endl);
- return 1;
+ if ( !mf->ReadListFile(0, cpackConfigFile.c_str()) )
+ {
+ cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Problem reding CPack config file: \"" << cpackConfigFile.c_str() << "\"" << std::endl);
+ return 1;
+ }
}
else if ( cpackConfigFileSpecified )
{