diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-08 17:54:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-06-08 17:54:02 (GMT) |
| commit | d18852d5961584125ae113fae23f4b55a760e159 (patch) | |
| tree | 49b99c2b6b5cfc94dab6bf4827ac16e77196f8df /Source/cmMakefileTargetGenerator.cxx | |
| parent | c8997d1b32c866b9f45c3af51e4abc431ca2ebc7 (diff) | |
| parent | 59e21ffa134faf0b089d9a704b3763e7f6f237d5 (diff) | |
| download | CMake-d18852d5961584125ae113fae23f4b55a760e159.zip CMake-d18852d5961584125ae113fae23f4b55a760e159.tar.gz CMake-d18852d5961584125ae113fae23f4b55a760e159.tar.bz2 | |
Merge topic 'extract-cmOutputConverter'
59e21ffa Port static calls from cmLocalGenerator to cmOutputConverter.
242dcc2c cmListFileBacktrace: Replace local generator with cmState::Snapshot.
1cff330b cmTarget: Port to cmOutputConverter.
2f1bd62b cmCustomCommandGenerator: Port to cmOutputConverter.
0f2a1324 cmCommandArgumentParserHelper: Port to cmOutputConverter.
4d8b79ad cmComputeLinkInformation: Port to cmOutputConverter.
8680520f cmMakefile: Make the cmState::Snapshot accessible.
6d7abb63 cmOutputConverter: Extract from cmLocalGenerator.
a8244157 cmState::Snapshot: Provide accessor for the cmState.
1f4ef396 cmLocalGenerator: Remove some commented lines of code.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 9ac9ddb..c26bc60 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1126,8 +1126,8 @@ void cmMakefileTargetGenerator::WriteTargetDependRules() pi != this->MultipleOutputPairs.end(); ++pi) { *this->InfoFileStream - << " " << cmLocalGenerator::EscapeForCMake(pi->first) - << " " << cmLocalGenerator::EscapeForCMake(pi->second) + << " " << cmOutputConverter::EscapeForCMake(pi->first) + << " " << cmOutputConverter::EscapeForCMake(pi->second) << "\n"; } *this->InfoFileStream << " )\n\n"; |