[Cmake-commits] CMake branch, next, updated. v3.7.2-2542-gbc0eaa2

[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  bc0eaa247812088f98bb77230a6c334125ff7a99 (commit)
       via  84f6bac8afd6a7d30de829023e74b5d10225e34f (commit)
      from  c5b1e1926e1726ce3f265464103f77e48fea9abd (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=bc0eaa247812088f98bb77230a6c334125ff7a99
commit bc0eaa247812088f98bb77230a6c334125ff7a99
Merge: c5b1e19 84f6bac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Feb 4 07:57:47 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 4 07:57:47 2017 -0500

    Merge topic 'vs-quote-rerun-paths' into next
    
    84f6bac8 VS: Fix quoting of special characters in cmake re-run check commands


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84f6bac8afd6a7d30de829023e74b5d10225e34f
commit 84f6bac8afd6a7d30de829023e74b5d10225e34f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 3 10:08:37 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Feb 4 07:55:55 2017 -0500

    VS: Fix quoting of special characters in cmake re-run check commands
    
    Fix our calls to `AddCustomCommandToOutput` for adding cmake re-run
    check commands to disable old-style quoting in favor of the full quoting
    logic.  This is necessary when paths contain special characters like `&`
    that old-style quoting logic does not handle.
    
    Reported-by: Steven Cook <sc at harshbutfair.org>
    Fixes: #16585

diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index e961a3d..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);
 
@@ -310,7 +310,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
     std::vector<std::string> no_byproducts;
     if (cmSourceFile* file = mf->AddCustomCommandToOutput(
           stamps, no_byproducts, listFiles, no_main_dependency, commandLines,
-          "Checking Build System", no_working_directory, true)) {
+          "Checking Build System", no_working_directory, true, false)) {
       gt->AddSource(file->GetFullPath());
     } else {
       cmSystemTools::Error("Error adding rule for ", stamps[0].c_str());
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 49b057b..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();
 
@@ -273,7 +271,7 @@ cmSourceFile* cmLocalVisualStudio7Generator::CreateVCProjBuildRule()
     cmSystemTools::CollapseFullPath(stampName.c_str());
   this->Makefile->AddCustomCommandToOutput(
     fullpathStampName.c_str(), listFiles, makefileIn.c_str(), commandLines,
-    comment.c_str(), no_working_directory, true);
+    comment.c_str(), no_working_directory, true, false);
   if (cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str())) {
     return file;
   } else {

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

Summary of changes:


hooks/post-receive
-- 
CMake