diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-21 12:42:26 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-21 12:42:32 (GMT) |
| commit | 4e0c75b78f5745d1369867f25a46ab7d158b4469 (patch) | |
| tree | 42de8e27d580c7338a405fec3402d6f6fe8e7f3f /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 2b427c2fadc917ebcaf2f246d53504ce5b6ad754 (diff) | |
| parent | 5731ec30f0596fefede4321e9883043aa7db60ba (diff) | |
| download | CMake-4e0c75b78f5745d1369867f25a46ab7d158b4469.zip CMake-4e0c75b78f5745d1369867f25a46ab7d158b4469.tar.gz CMake-4e0c75b78f5745d1369867f25a46ab7d158b4469.tar.bz2 | |
Merge topic 'clang-tidy'
5731ec30f0 clang-tidy: fix warnings from version 7
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2636
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index fbc756c..0271b6f 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -112,7 +112,7 @@ std::string cmGlobalNinjaGenerator::EncodeLiteral(const std::string& lit) std::string cmGlobalNinjaGenerator::EncodePath(const std::string& path) { - std::string result = path; // NOLINT(clang-tidy) + std::string result = path; #ifdef _WIN32 if (this->IsGCCOnWindows()) std::replace(result.begin(), result.end(), '\\', '/'); @@ -254,7 +254,7 @@ void cmGlobalNinjaGenerator::WriteCustomCommandBuild( bool restat, const cmNinjaDeps& outputs, const cmNinjaDeps& deps, const cmNinjaDeps& orderOnly) { - std::string cmd = command; // NOLINT(clang-tidy) + std::string cmd = command; // NOLINT(*) #ifdef _WIN32 if (cmd.empty()) // TODO Shouldn't an empty command be handled by ninja? @@ -1940,7 +1940,7 @@ int cmcmd_cmake_ninja_dyndep(std::vector<std::string>::const_iterator argBeg, cm.SetHomeOutputDirectory(dir_top_bld); std::unique_ptr<cmGlobalNinjaGenerator> ggd( static_cast<cmGlobalNinjaGenerator*>(cm.CreateGlobalGenerator("Ninja"))); - if (!ggd.get() || + if (!ggd || !ggd->WriteDyndepFile(dir_top_src, dir_top_bld, dir_cur_src, dir_cur_bld, arg_dd, arg_ddis, module_dir, linked_target_dirs)) { |