diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-21 19:35:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-22 12:44:46 (GMT) |
| commit | b3475ba57bc839125440fe8d21f611198041434e (patch) | |
| tree | e11dd2e8a36bcbc4881d372a6ad4ba70e9b05604 /Source/cmMakefileTargetGenerator.cxx | |
| parent | ada5ffce7bad40c56e5d0dd76b9a7b30c96a9e92 (diff) | |
| download | CMake-b3475ba57bc839125440fe8d21f611198041434e.zip CMake-b3475ba57bc839125440fe8d21f611198041434e.tar.gz CMake-b3475ba57bc839125440fe8d21f611198041434e.tar.bz2 | |
Makefile: Fix <LANG>_INCLUDE_WHAT_YOU_USE with CTEST_USE_LAUNCHERS
The 'ctest --launch' command must be placed before the IWYU launcher on
the compiler command line. Extend the RunCMake.IncludeWhatYouUse test
to cover this case. The Ninja generator already does it correctly.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -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 893b70d..b28a701 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, |