summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-02-08 15:32:55 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-02-08 15:32:55 (GMT)
commit08e53620044c1ac5ff29adb695a7c6bdde480fb4 (patch)
treeda88cc17846ac711b1ac4d7a2b84804c808c63e1 /Help
parent037738ac194a7e50c92ffda60eaca707bb35bac9 (diff)
parent497cad7c883dc401b4d78109c3a057fb38745d9e (diff)
downloadCMake-08e53620044c1ac5ff29adb695a7c6bdde480fb4.zip
CMake-08e53620044c1ac5ff29adb695a7c6bdde480fb4.tar.gz
CMake-08e53620044c1ac5ff29adb695a7c6bdde480fb4.tar.bz2
Merge topic 'error-multiple-targets'
497cad7c cmake: Teach --build to reject multiple --target options 886acd80 Help: Fix reference to `cmake --build` in cmake(1) manual
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake.1.rst3
-rw-r--r--Help/release/dev/error-multiple-targets.rst6
2 files changed, 8 insertions, 1 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst
index 91af3e3..959148e 100644
--- a/Help/manual/cmake.1.rst
+++ b/Help/manual/cmake.1.rst
@@ -58,13 +58,14 @@ Options
<dir> = Project binary directory to be built.
--target <tgt> = Build <tgt> instead of default targets.
+ May only be specified once.
--config <cfg> = For multi-configuration tools, choose <cfg>.
--clean-first = Build target 'clean' first, then build.
(To clean only, use --target 'clean'.)
--use-stderr = Ignored. Behavior is default in CMake >= 3.0.
-- = Pass remaining options to the native tool.
- Run cmake --build with no options for quick help.
+ Run ``cmake --build`` with no options for quick help.
``-N``
View mode only.
diff --git a/Help/release/dev/error-multiple-targets.rst b/Help/release/dev/error-multiple-targets.rst
new file mode 100644
index 0000000..060b26b
--- /dev/null
+++ b/Help/release/dev/error-multiple-targets.rst
@@ -0,0 +1,6 @@
+error-multiple-targets
+----------------------
+
+* The :manual:`cmake(1)` ``--build`` command-line tool now rejects multiple
+ ``--target`` options with an error instead of silently ignoring all but the
+ last one.