Merge topic 'ninja-mingw'

82badfff Ninja: Fix CMP0058 on MinGW
c5ff50fc Tests: Fix CustomCommandByproducts regex for phony rules

Acked-by: Kitware Robot <[email protected]>
Merge-request: !919

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);
     }
   }
 }

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)