[Cmake-commits] CMake branch, next, updated. v3.7.2-2540-gc5b1e19

[Brad King]

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, next has been updated
       via  c5b1e1926e1726ce3f265464103f77e48fea9abd (commit)
       via  3e731810ee6fad31692baedffa9d1263f8156f76 (commit)
      from  5d570616a4f3675260490da1604b8ad17ce98bbe (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=c5b1e1926e1726ce3f265464103f77e48fea9abd
commit c5b1e1926e1726ce3f265464103f77e48fea9abd
Merge: 5d57061 3e73181
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 4 07:55:48 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 4 07:55:48 2017 -0500

    Merge topic 'vs-quote-rerun-paths' into next
    
    3e731810 fixup! VS: Fix quoting of special characters in cmake re-run check commands


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e731810ee6fad31692baedffa9d1263f8156f76
commit 3e731810ee6fad31692baedffa9d1263f8156f76
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 4 07:54:56 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Feb 4 07:54:56 2017 -0500

    fixup! VS: Fix quoting of special characters in cmake re-run check commands

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index c4f7a33..bc8cc4c 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -298,7 +298,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
     commandLine.push_back("--check-stamp-list");
     commandLine.push_back(stampList.c_str());
     commandLine.push_back("--vs-solution-file");
-    commandLine.push_back("\"$(SolutionPath)\"");
+    commandLine.push_back("$(SolutionPath)");
     cmCustomCommandLines commandLines;
     commandLines.push_back(commandLine);
 
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 88c25b8..38dda04 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -260,9 +260,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
   args += this->GetBinaryDirectory();
   commandLine.push_back(args);
   commandLine.push_back("--check-stamp-file");
-  std::string stampFilename = this->ConvertToOutputFormat(
-    cmSystemTools::CollapseFullPath(stampName), cmOutputConverter::SHELL);
-  commandLine.push_back(stampFilename.c_str());
+  commandLine.push_back(stampName);
 
   std::vector<std::string> const& listFiles = this->Makefile->GetListFiles();
 

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

Summary of changes:
 Source/cmGlobalVisualStudio8Generator.cxx |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx  |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake