diff options
author | Brad King <brad.king@kitware.com> | 2001-02-26 23:20:37 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2001-02-26 23:20:37 (GMT) |
commit | 6ce04806e0bc1d3bc3b75d3368f17744f5ac7453 (patch) | |
tree | 5389ae48da48f7d3ab7a7f375b8c31273120ffe2 | |
parent | 98590039d668d1d913e381ca89758666048ceab8 (diff) | |
download | CMake-6ce04806e0bc1d3bc3b75d3368f17744f5ac7453.zip CMake-6ce04806e0bc1d3bc3b75d3368f17744f5ac7453.tar.gz CMake-6ce04806e0bc1d3bc3b75d3368f17744f5ac7453.tar.bz2 |
ERR: Fixed configuration file output to open file in output directory.
-rw-r--r-- | Source/cmCableInstantiateCommand.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Source/cmCableInstantiateCommand.cxx b/Source/cmCableInstantiateCommand.cxx index bd27498..c82eabb 100644 --- a/Source/cmCableInstantiateCommand.cxx +++ b/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) |