[Cmake-commits] CMake branch, next, updated. v3.7.2-2531-ga792ec4

[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  a792ec426975260a7fe6fb87ae0972030a06d2c6 (commit)
       via  4bea231d1dff8063c2db37aa4344d36994ec6b46 (commit)
      from  70284f1b4c89252e2801915312e1c5acac7cb61e (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=a792ec426975260a7fe6fb87ae0972030a06d2c6
commit a792ec426975260a7fe6fb87ae0972030a06d2c6
Merge: 70284f1 4bea231
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 3 11:47:02 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 3 11:47:02 2017 -0500

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bea231d1dff8063c2db37aa4344d36994ec6b46
commit 4bea231d1dff8063c2db37aa4344d36994ec6b46
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: Fri Feb 3 10:08:37 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..c4f7a33 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -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..88c25b8 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -273,7 +273,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:
 Source/cmGlobalVisualStudio8Generator.cxx |    2 +-
 Source/cmLocalVisualStudio7Generator.cxx  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake