summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-01-11 14:58:28 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-01-11 14:58:28 (GMT)
commit0884c9e46a108e8d7b52f6d96242f147ab12d001 (patch)
tree514e5cf7a37a98f23eb8f54a0469cfe43387977b
parentff6a034e0bb7731c97a90afec849d8c80e2a783d (diff)
parent154def305e7a95d9280573b053170b17539c9f69 (diff)
downloadCMake-0884c9e46a108e8d7b52f6d96242f147ab12d001.zip
CMake-0884c9e46a108e8d7b52f6d96242f147ab12d001.tar.gz
CMake-0884c9e46a108e8d7b52f6d96242f147ab12d001.tar.bz2
Merge topic 'SublimeText-no-VERBOSE'
154def30 Sublime: Do not build with verbose output
-rw-r--r--Help/release/dev/SublimeText-no-VERBOSE.rst6
-rw-r--r--Source/cmExtraSublimeTextGenerator.cxx12
2 files changed, 9 insertions, 9 deletions
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;
}