summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-04-28 13:51:56 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-04-28 13:52:07 (GMT)
commit12512bdb518ca1278a59997c959272625d7f6b6b (patch)
treee48f8343d68416d08378a8fda2de33b42279fd90 /Help
parent34a083a1951306aa9d0c0a5f14ac17706f475546 (diff)
parent28d83837978aefc7f6e467b41ff792817da9ec95 (diff)
downloadCMake-12512bdb518ca1278a59997c959272625d7f6b6b.zip
CMake-12512bdb518ca1278a59997c959272625d7f6b6b.tar.gz
CMake-12512bdb518ca1278a59997c959272625d7f6b6b.tar.bz2
Merge topic 'separgs-native'
28d83837 separgs: Use NATIVE_COMMAND where appropriate 2a207aac separgs: Add a NATIVE_COMMAND mode 81841426 separgs: Migrate tests to RunCMake tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !753
Diffstat (limited to 'Help')
-rw-r--r--Help/command/separate_arguments.rst9
-rw-r--r--Help/release/dev/separgs-native.rst5
2 files changed, 11 insertions, 3 deletions
diff --git a/Help/command/separate_arguments.rst b/Help/command/separate_arguments.rst
index 1fd3cd1..47982a5 100644
--- a/Help/command/separate_arguments.rst
+++ b/Help/command/separate_arguments.rst
@@ -5,9 +5,9 @@ Parse space-separated arguments into a semicolon-separated list.
::
- separate_arguments(<var> <UNIX|WINDOWS>_COMMAND "<args>")
+ separate_arguments(<var> <NATIVE|UNIX|WINDOWS>_COMMAND "<args>")
-Parses a unix- or windows-style command-line string "<args>" and
+Parses a UNIX- or Windows-style command-line string "<args>" and
stores a semicolon-separated list of the arguments in ``<var>``. The
entire command line must be given in one "<args>" argument.
@@ -16,12 +16,15 @@ recognizes both single-quote and double-quote pairs. A backslash
escapes the next literal character (``\"`` is ``"``); there are no special
escapes (``\n`` is just ``n``).
-The ``WINDOWS_COMMAND`` mode parses a windows command-line using the same
+The ``WINDOWS_COMMAND`` mode parses a Windows command-line using the same
syntax the runtime library uses to construct argv at startup. It
separates arguments by whitespace that is not double-quoted.
Backslashes are literal unless they precede double-quotes. See the
MSDN article `Parsing C Command-Line Arguments`_ for details.
+The ``NATIVE_COMMAND`` mode parses a Windows command-line if the host
+system is Windows, and a UNIX command-line otherwise.
+
.. _`Parsing C Command-Line Arguments`: https://msdn.microsoft.com/library/a1y7w461.aspx
::
diff --git a/Help/release/dev/separgs-native.rst b/Help/release/dev/separgs-native.rst
new file mode 100644
index 0000000..943f08e
--- /dev/null
+++ b/Help/release/dev/separgs-native.rst
@@ -0,0 +1,5 @@
+separgs-native
+-------------------
+
+* A ``NATIVE_COMMAND`` mode was added to :command:`separate_arguments`
+ performing argument separation depening on the host operating system.