diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-01 17:59:28 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-01 14:00:58 -0400 |
| commit | 6a42b9609f1d0a047394a8d63fb8ddb803abce34 (patch) | |
| tree | 4340b346867a0939b37f0ad3c6727e2ee5ce0b15 | |
| parent | 860db083cafb1337147923f7dd21b57767abbee3 (diff) | |
| parent | 82badfffc34f043521ff3314047a3831e0fb17c7 (diff) | |
| download | cmake-6a42b9609f1d0a047394a8d63fb8ddb803abce34.tar.gz | |
Merge topic 'ninja-mingw'
82badfff Ninja: Fix CMP0058 on MinGW
c5ff50fc Tests: Fix CustomCommandByproducts regex for phony rules
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !919
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 4 | ||||
| -rw-r--r-- | Tests/CustomCommandByproducts/ninja-check.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 39f5d8f78c..bb0b83a3f6 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -209,7 +209,7 @@ void cmGlobalNinjaGenerator::WriteBuild( ++i) { build += " " + EncodeIdent(EncodePath(*i), os); if (this->ComputingUnknownDependencies) { - this->CombinedBuildOutputs.insert(EncodePath(*i)); + this->CombinedBuildOutputs.insert(*i); } } if (!implicitOuts.empty()) { @@ -311,7 +311,7 @@ void cmGlobalNinjaGenerator::WriteCustomCommandBuild( // we need to track every dependency that comes in, since we are trying // to find dependencies that are side effects of build commands for (cmNinjaDeps::const_iterator i = deps.begin(); i != deps.end(); ++i) { - this->CombinedCustomCommandExplicitDependencies.insert(EncodePath(*i)); + this->CombinedCustomCommandExplicitDependencies.insert(*i); } } } diff --git a/Tests/CustomCommandByproducts/ninja-check.cmake b/Tests/CustomCommandByproducts/ninja-check.cmake index 2fc3cc217b..a7beb3d645 100644 --- a/Tests/CustomCommandByproducts/ninja-check.cmake +++ b/Tests/CustomCommandByproducts/ninja-check.cmake @@ -4,7 +4,7 @@ if("${build_ninja}" MATCHES [====[ # Tell Ninja that they may appear as side effects of build rules # otherwise ordered by order-only dependencies. -((build [^:]*: phony [^\n]* +((build [^:]*: phony[^\n]* )*)# ========]====]) set(phony "${CMAKE_MATCH_1}") if(NOT phony) |