Bläddra i källkod

ERR: Fixed configuration file output to open file in output directory.

Brad King 25 år sedan
förälder
incheckning
6ce04806e0
1 ändrade filer med 11 tillägg och 4 borttagningar
  1. 11 4
      Source/cmCableInstantiateCommand.cxx

+ 11 - 4
Source/cmCableInstantiateCommand.cxx

@@ -29,12 +29,19 @@ bool cmCabilInstantiateCommand::Invoke(std::vector<std::string>& args)
   
   // This command instance needs to use the cmCabilData instance.
   this->SetupCabilData();
-
+  
+  // The output file must be opened in the output directory.
+  std::string file = m_Makefile->GetStartOutputDirectory();
+  
+  // The first argument is the file into which the configuration code is to be
+  // written.
   std::vector<std::string>::const_iterator arg = args.begin();
+
+  // Concatenate the file name onto the path.
+  file += "/" + *arg++;
   
-  // Get the output file into which the configuration code is to be
-  // written.  The name of the file is the first argument.
-  m_OutputFile = m_CabilData->GetOutputFile(*arg++, this);
+  // Get the OutputFile corresponding to this file name.
+  m_OutputFile = m_CabilData->GetOutputFile(file, this);
   
   // The rest of the arguments are the elements to be placed in the set.
   for(; arg != args.end(); ++arg)