Bill Hoffman пре 19 година
родитељ
комит
ccdca71332

+ 0 - 1
Source/cmAddCustomCommandCommand.cxx

@@ -211,7 +211,6 @@ bool cmAddCustomCommandCommand::InitialPass(std::vector<std::string> const& args
     this->SetError(msg.str().c_str());
     this->SetError(msg.str().c_str());
     return false;
     return false;
     }
     }
-
   // Choose which mode of the command to use.
   // Choose which mode of the command to use.
   if(source.empty() && output.empty())
   if(source.empty() && output.empty())
     {
     {

+ 1 - 1
Source/cmAddCustomTargetCommand.cxx

@@ -64,7 +64,7 @@ bool cmAddCustomTargetCommand::InitialPass(std::vector<std::string> const& args)
       {
       {
       doing = doing_depends;
       doing = doing_depends;
       }
       }
-    if(copy == "WORKING_DIRECTORY")
+    else if(copy == "WORKING_DIRECTORY")
       {
       {
       doing = doing_working_directory;
       doing = doing_working_directory;
       }
       }

+ 1 - 1
Source/cmVTKWrapJavaCommand.cxx

@@ -185,5 +185,5 @@ void cmVTKWrapJavaCommand::FinalPass()
   const char* no_working_directory = 0;
   const char* no_working_directory = 0;
   m_Makefile->AddUtilityCommand((m_LibraryName+"JavaClasses").c_str(),
   m_Makefile->AddUtilityCommand((m_LibraryName+"JavaClasses").c_str(),
                                 true, no_output, 
                                 true, no_output, 
-                                alldepends, "", no_working_directory);
+                                alldepends, no_working_directory, "");
 }
 }