Browse Source

ENH: Allow running without config file

Andy Cedilnik 19 years ago
parent
commit
2e19553e7c
1 changed files with 6 additions and 3 deletions
  1. 6 3
      Source/CPack/cpack.cxx

+ 6 - 3
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 )
       {