[Cmake-commits] CMake branch, next, updated. v3.7.2-2551-g9c24b1f

Brad King brad.king at kitware.com
Mon Feb 6 09:52:59 EST 2017


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  9c24b1fa2b36569b6f53b9b12a1cc9ffca8146ee (commit)
       via  d4425e65f256faf78ccaf425653e5e17b4527f0e (commit)
      from  c13efe3208f32cba458eb89dde44f3fe29828a7e (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=9c24b1fa2b36569b6f53b9b12a1cc9ffca8146ee
commit 9c24b1fa2b36569b6f53b9b12a1cc9ffca8146ee
Merge: c13efe3 d4425e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 6 09:52:58 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 6 09:52:58 2017 -0500

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


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4425e65f256faf78ccaf425653e5e17b4527f0e
commit d4425e65f256faf78ccaf425653e5e17b4527f0e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 6 09:12:26 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 6 09:52:36 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 bc8cc4c..8353a3f 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -298,7 +298,9 @@ 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)");
+    std::string const sln = std::string(lg->GetBinaryDirectory()) + "/" +
+      lg->GetProjectName() + ".sln";
+    commandLine.push_back(sln);
     cmCustomCommandLines commandLines;
     commandLines.push_back(commandLine);
 

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

Summary of changes:
 Source/cmGlobalVisualStudio8Generator.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list