[Cmake-commits] CMake branch, master, updated. v3.8.2-1374-g6a42b96

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  6a42b9609f1d0a047394a8d63fb8ddb803abce34 (commit)
       via  82badfffc34f043521ff3314047a3831e0fb17c7 (commit)
       via  c5ff50fc19ac8393be3cad5f7c1578a6a8c64819 (commit)
      from  860db083cafb1337147923f7dd21b57767abbee3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a42b9609f1d0a047394a8d63fb8ddb803abce34
commit 6a42b9609f1d0a047394a8d63fb8ddb803abce34
Merge: 860db08 82badff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 1 17:59:28 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jun 1 14:00:58 2017 -0400

    Merge topic 'ninja-mingw'
    
    82badfff Ninja: Fix CMP0058 on MinGW
    c5ff50fc Tests: Fix CustomCommandByproducts regex for phony rules
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !919


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82badfffc34f043521ff3314047a3831e0fb17c7
commit 82badfffc34f043521ff3314047a3831e0fb17c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 31 13:32:32 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 31 13:44:16 2017 -0400

    Ninja: Fix CMP0058 on MinGW
    
    For CMP0058 we identify dependencies that have no rules to generate them
    by collecting a set of all dependencies and a set of all files CMake
    knows are generated by something, and then computing a set difference.
    Fix construction of these sets to use the same form for each path.
    This is after ConvertToNinjaPath but before EncodePath.
    
    Without this, the slash conversion done by EncodePath for the GNU
    compiler on Windows results in a mismatch, triggering an incorrect
    CMP0058 warning.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 39f5d8f..bb0b83a 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);
     }
   }
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5ff50fc19ac8393be3cad5f7c1578a6a8c64819
commit c5ff50fc19ac8393be3cad5f7c1578a6a8c64819
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 31 11:48:02 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 31 11:48:02 2017 -0400

    Tests: Fix CustomCommandByproducts regex for phony rules
    
    Update the regex to match phony rules that have no inputs.

diff --git a/Tests/CustomCommandByproducts/ninja-check.cmake b/Tests/CustomCommandByproducts/ninja-check.cmake
index 2fc3cc2..a7beb3d 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)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx               |    4 ++--
 Tests/CustomCommandByproducts/ninja-check.cmake |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake