ERR: Fixed configuration file output to open file in output directory.
This commit is contained in:
parent
98590039d6
commit
6ce04806e0
|
@ -30,11 +30,18 @@ bool cmCabilInstantiateCommand::Invoke(std::vector<std::string>& args)
|
||||||
// This command instance needs to use the cmCabilData instance.
|
// This command instance needs to use the cmCabilData instance.
|
||||||
this->SetupCabilData();
|
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();
|
std::vector<std::string>::const_iterator arg = args.begin();
|
||||||
|
|
||||||
// Get the output file into which the configuration code is to be
|
// Concatenate the file name onto the path.
|
||||||
// written. The name of the file is the first argument.
|
file += "/" + *arg++;
|
||||||
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.
|
// The rest of the arguments are the elements to be placed in the set.
|
||||||
for(; arg != args.end(); ++arg)
|
for(; arg != args.end(); ++arg)
|
||||||
|
|
Loading…
Reference in New Issue