[Cmake-commits] CMake branch, master, updated. v3.8.1-1362-gde16ff3

[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  de16ff3e58b0518c707ae877e80b6f81e26a4326 (commit)
       via  6a2f8335638605d34f066f4e1f2fc646e324564e (commit)
       via  781eb380f47c743ddb9f3ad65c6f7d3eda7af171 (commit)
      from  47281310bf610f3ab975d00831e9f3fe713ddde1 (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=de16ff3e58b0518c707ae877e80b6f81e26a4326
commit de16ff3e58b0518c707ae877e80b6f81e26a4326
Merge: 4728131 6a2f833
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 31 12:55:40 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed May 31 08:55:44 2017 -0400

    Merge topic 'ninja-mingw'
    
    6a2f8335 Ninja: Fix escaping of path to depfile
    781eb380 Tests: Fix VSResource test on MinGW with Ninja and a space in the path
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !911


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a2f8335638605d34f066f4e1f2fc646e324564e
commit 6a2f8335638605d34f066f4e1f2fc646e324564e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 30 14:17:00 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 30 15:30:43 2017 -0400

    Ninja: Fix escaping of path to depfile
    
    Replace the dedicated and non-portable escaping code with use of our
    standard escaping logic.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index e1e165c..39f5d8f 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -146,13 +146,6 @@ std::string cmGlobalNinjaGenerator::EncodePath(const std::string& path)
   return EncodeLiteral(result);
 }
 
-std::string cmGlobalNinjaGenerator::EncodeDepfileSpace(const std::string& path)
-{
-  std::string result = path;
-  cmSystemTools::ReplaceString(result, " ", "\\ ");
-  return result;
-}
-
 void cmGlobalNinjaGenerator::WriteBuild(
   std::ostream& os, const std::string& comment, const std::string& rule,
   const cmNinjaDeps& outputs, const cmNinjaDeps& implicitOuts,
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index b1d6155..41c5175 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -75,7 +75,6 @@ public:
   static std::string EncodeIdent(const std::string& ident, std::ostream& vars);
   static std::string EncodeLiteral(const std::string& lit);
   std::string EncodePath(const std::string& path);
-  static std::string EncodeDepfileSpace(const std::string& path);
 
   cmLinkLineComputer* CreateLinkLineComputer(
     cmOutputConverter* outputConverter,
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 7e29681..2f4cccb 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -822,8 +822,8 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
   vars["DEFINES"] = this->ComputeDefines(source, language);
   vars["INCLUDES"] = this->GetIncludes(language);
   if (!this->NeedDepTypeMSVC(language)) {
-    vars["DEP_FILE"] =
-      cmGlobalNinjaGenerator::EncodeDepfileSpace(objectFileName + ".d");
+    vars["DEP_FILE"] = this->GetLocalGenerator()->ConvertToOutputFormat(
+      objectFileName + ".d", cmOutputConverter::SHELL);
   }
 
   this->ExportObjectCompileCommand(
@@ -920,8 +920,8 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatement(
     vars["INCLUDES"] = sourceDirectoryFlag + " " + vars["INCLUDES"];
 
     // Explicit preprocessing always uses a depfile.
-    ppVars["DEP_FILE"] =
-      cmGlobalNinjaGenerator::EncodeDepfileSpace(ppFileName + ".d");
+    ppVars["DEP_FILE"] = this->GetLocalGenerator()->ConvertToOutputFormat(
+      ppFileName + ".d", cmOutputConverter::SHELL);
     // The actual compilation does not need a depfile because it
     // depends on the already-preprocessed source.
     vars.erase("DEP_FILE");

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=781eb380f47c743ddb9f3ad65c6f7d3eda7af171
commit 781eb380f47c743ddb9f3ad65c6f7d3eda7af171
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 30 14:10:45 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 30 15:30:40 2017 -0400

    Tests: Fix VSResource test on MinGW with Ninja and a space in the path

diff --git a/Tests/VSResource/CMakeLists.txt b/Tests/VSResource/CMakeLists.txt
index 3b9cfc3..ee660ed 100644
--- a/Tests/VSResource/CMakeLists.txt
+++ b/Tests/VSResource/CMakeLists.txt
@@ -18,9 +18,8 @@ if(CMAKE_RC_COMPILER MATCHES windres)
   message(STATUS "CMAKE_RC_COMPILER MATCHES windres")
   add_definitions(/DCMAKE_RCDEFINE=test.txt)
   add_definitions(/DCMAKE_RCDEFINE_NO_QUOTED_STRINGS)
-  if(MSYS AND CMAKE_CURRENT_BINARY_DIR MATCHES " ")
-    # windres cannot handle spaces in include dir, and
-    # for the MSys shell we do not convert to shortpath.
+  if(CMAKE_CURRENT_BINARY_DIR MATCHES " ")
+    # windres cannot handle spaces in include dir
     set(CMAKE_RC_NO_INCLUDE 1)
   endif()
 elseif(MSVC60)

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |    7 -------
 Source/cmGlobalNinjaGenerator.h   |    1 -
 Source/cmNinjaTargetGenerator.cxx |    8 ++++----
 Tests/VSResource/CMakeLists.txt   |    5 ++---
 4 files changed, 6 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake