summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-02-03 16:30:01 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-02-03 16:30:58 (GMT)
commitea5c6c3c86c8f22634e32cb8d1ebe8bc1a2c0752 (patch)
tree83dfe6204fc1dae11b176c7c5f724e1ee849e6e9
parent095d50598b7fe947937a03cb02d74e3ee13bb542 (diff)
parent3aea8658014177c6ad56f46876196a4428977909 (diff)
downloadCMake-ea5c6c3c86c8f22634e32cb8d1ebe8bc1a2c0752.zip
CMake-ea5c6c3c86c8f22634e32cb8d1ebe8bc1a2c0752.tar.gz
CMake-ea5c6c3c86c8f22634e32cb8d1ebe8bc1a2c0752.tar.bz2
Merge topic 'clang-tidy-driver-mode'
3aea865801 clang-tidy: Fix explicit --driver-mode= argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4307
-rw-r--r--Source/cmMakefileTargetGenerator.cxx2
-rw-r--r--Source/cmNinjaTargetGenerator.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index a2fa3b1..d7e2de6 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -788,7 +788,7 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(
driverMode = lang == "C" ? "gcc" : "g++";
}
run_iwyu += this->LocalGenerator->EscapeForShell(
- cmStrCat(tidy, ";--driver-mode=", driverMode));
+ cmStrCat(tidy, ";--extra-arg-before=--driver-mode=", driverMode));
}
if (cpplint && *cpplint) {
run_iwyu += " --cpplint=";
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 5e8cc7d..0e74678 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -767,7 +767,7 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang,
driverMode = lang == "C" ? "gcc" : "g++";
}
run_iwyu += this->GetLocalGenerator()->EscapeForShell(
- cmStrCat(tidy, ";--driver-mode=", driverMode));
+ cmStrCat(tidy, ";--extra-arg-before=--driver-mode=", driverMode));
}
if (cpplint && *cpplint) {
run_iwyu += " --cpplint=";