[Cmake-commits] CMake branch, next, updated. v3.7.1-1960-g3ae275f

[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  3ae275f4f8a4dcf6721c0112b7d4cfcb9366a35e (commit)
       via  154def305e7a95d9280573b053170b17539c9f69 (commit)
      from  ae4b031f2bcd15bb06edb97a217d8461926cc950 (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=3ae275f4f8a4dcf6721c0112b7d4cfcb9366a35e
commit 3ae275f4f8a4dcf6721c0112b7d4cfcb9366a35e
Merge: ae4b031 154def3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 10 10:53:22 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 10:53:22 2017 -0500

    Merge topic 'SublimeText-no-VERBOSE' into next
    
    154def30 Sublime: Do not build with verbose output


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=154def305e7a95d9280573b053170b17539c9f69
commit 154def305e7a95d9280573b053170b17539c9f69
Author:     Richard Collins <the.hungarian at gmail.com>
AuthorDate: Fri Dec 16 12:41:55 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 10 10:52:48 2017 -0500

    Sublime: Do not build with verbose output
    
    Remove the hard-coded use of `make VERBOSE=1` and `ninja -v`.

diff --git a/Help/release/dev/SublimeText-no-VERBOSE.rst b/Help/release/dev/SublimeText-no-VERBOSE.rst
new file mode 100644
index 0000000..70dfa2b
--- /dev/null
+++ b/Help/release/dev/SublimeText-no-VERBOSE.rst
@@ -0,0 +1,6 @@
+SublimeText-no-VERBOSE
+----------------------
+
+* The :generator:`Sublime Text 2` generator no longer runs the native
+  build command (e.g. ``ninja`` or ``make``) with verbose build output
+  enabled.
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx
index dfefefe..36ba520 100644
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@@ -323,16 +323,12 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
     std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile);
     command += ", \"/NOLOGO\", \"/f\", \"";
     command += makefileName + "\"";
-    command += ", \"VERBOSE=1\", \"";
-    command += target;
-    command += "\"";
+    command += ", \"" + target + "\"";
   } else if (generator == "Ninja") {
     std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile);
     command += ", \"-f\", \"";
     command += makefileName + "\"";
-    command += ", \"-v\", \"";
-    command += target;
-    command += "\"";
+    command += ", \"" + target + "\"";
   } else {
     std::string makefileName;
     if (generator == "MinGW Makefiles") {
@@ -344,9 +340,7 @@ std::string cmExtraSublimeTextGenerator::BuildMakeCommand(
     }
     command += ", \"-f\", \"";
     command += makefileName + "\"";
-    command += ", \"VERBOSE=1\", \"";
-    command += target;
-    command += "\"";
+    command += ", \"" + target + "\"";
   }
   return command;
 }

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

Summary of changes:
 Help/release/dev/SublimeText-no-VERBOSE.rst |    6 ++++++
 Source/cmExtraSublimeTextGenerator.cxx      |   12 +++---------
 2 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 Help/release/dev/SublimeText-no-VERBOSE.rst


hooks/post-receive
-- 
CMake