diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-08 14:44:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-08 14:44:37 (GMT) |
| commit | 4ec359bd6256e870d9b233fd5cd105e452a62300 (patch) | |
| tree | 8796899aeb1436d6a6f0b4e2d5f28db8dc40d2d1 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 049b10e2f621800f0b8da1918784dad7a049d6a8 (diff) | |
| parent | 0cd654c8e23b19311bae876ada4ad5b432c1ad1b (diff) | |
| download | CMake-4ec359bd6256e870d9b233fd5cd105e452a62300.zip CMake-4ec359bd6256e870d9b233fd5cd105e452a62300.tar.gz CMake-4ec359bd6256e870d9b233fd5cd105e452a62300.tar.bz2 | |
Merge topic 'clang-tidy'
0cd654c8 cmGeneratorTarget: Correctly set FortranModuleDirectoryCreated
bac93dcf cmGeneratorTarget: Don't assing a bool to a string
1e994985 cmGlobalNinjaGenerator: Suppress clang-tidy warning
5ae3966d cmCTestSubmitHandler: Remove redundant c_str()
443180fb cmCPluginAPI: Fix clang-tidy findings
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 830ab7f..22de7c4 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -130,7 +130,7 @@ std::string cmGlobalNinjaGenerator::EncodeLiteral(const std::string& lit) std::string cmGlobalNinjaGenerator::EncodePath(const std::string& path) { - std::string result = path; + std::string result = path; // NOLINT(clang-tidy) #ifdef _WIN32 if (this->IsGCCOnWindows()) std::replace(result.begin(), result.end(), '\\', '/'); @@ -283,7 +283,7 @@ void cmGlobalNinjaGenerator::WriteCustomCommandBuild( bool restat, const cmNinjaDeps& outputs, const cmNinjaDeps& deps, const cmNinjaDeps& orderOnly) { - std::string cmd = command; + std::string cmd = command; // NOLINT(clang-tidy) #ifdef _WIN32 if (cmd.empty()) // TODO Shouldn't an empty command be handled by ninja? |