aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-12-09 15:55:11 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-12-09 15:55:11 +0200
commitbd939839b44d90d027517e447537dd52539269ff (patch)
treea2652b33775f4e4dd1f5cb594ff56b8f2876efd6 /doc
parentc9d13dff940ab16e28f2440a819a0151a3a7543f (diff)
Minor tweaks to requires manifest value documentation
Diffstat (limited to 'doc')
-rw-r--r--doc/manual.cli5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/manual.cli b/doc/manual.cli
index 1a51a88..901c4da 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -1175,6 +1175,7 @@ are treated the same):
<alternatives> = <requirement> [ '|' <requirement>]*
<requirement> = <id> | <dependency>
+<id> = <name>
\
The package requirements (other than other packages). Such requirements are
@@ -1184,7 +1185,7 @@ purpose of capturing them in the manifest is for documentation. Similar to
requirement. For example:
\
-requires: linux | windows | macosx
+requires: linux | windows | macos
requires: c++11
requires: ? ; VC 15 or later if targeting Windows.
requires: ? ; libc++ if using Clang on Mac OS.
@@ -1228,7 +1229,7 @@ windows
\
gcc[_X.Y.Z] ; For example: gcc_6, gcc_4.9, gcc_5.0.0
clang[_X.Y] ; For example: clang_6, clang_3.4, clang_3.4.1
-msvc[_NU] ; For example: msvc_14, msvc_15u3
+msvc[_N.U] ; For example: msvc_14, msvc_15.3
\
The following pre-defined ids are recognized by automated build bots: