diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-26 13:23:54 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-26 13:23:54 (GMT) |
| commit | 36386413969149fde706c04dec478a3de50c5a28 (patch) | |
| tree | fafc61eaeaa7578a2d376ced817e3b486a6f4474 /Source | |
| parent | 4f0125a45b8643ff62c79c79eac7caf63c8fe7bd (diff) | |
| parent | b3475ba57bc839125440fe8d21f611198041434e (diff) | |
| download | CMake-36386413969149fde706c04dec478a3de50c5a28.zip CMake-36386413969149fde706c04dec478a3de50c5a28.tar.gz CMake-36386413969149fde706c04dec478a3de50c5a28.tar.bz2 | |
Merge topic 'run-include-what-you-use'
b3475ba5 Makefile: Fix <LANG>_INCLUDE_WHAT_YOU_USE with CTEST_USE_LAUNCHERS
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 0c8acc7..7b88bc7 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -761,13 +761,6 @@ cmMakefileTargetGenerator source.GetFullPath(), workingDirectory, compileCommand); } - // Expand placeholders in the commands. - for(std::vector<std::string>::iterator i = compileCommands.begin(); - i != compileCommands.end(); ++i) - { - this->LocalGenerator->ExpandRuleVariables(*i, vars); - } - // Maybe insert an include-what-you-use runner. if (!compileCommands.empty() && (lang == "C" || lang == "CXX")) { @@ -782,6 +775,13 @@ cmMakefileTargetGenerator } } + // Expand placeholders in the commands. + for(std::vector<std::string>::iterator i = compileCommands.begin(); + i != compileCommands.end(); ++i) + { + this->LocalGenerator->ExpandRuleVariables(*i, vars); + } + // Change the command working directory to the local build tree. this->LocalGenerator->CreateCDCommand (compileCommands, |