aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/markdown/Adding-arguments.md13
-rw-r--r--docs/markdown/Reference-manual.md8
-rw-r--r--docs/markdown/Videos.md4
3 files changed, 25 insertions, 0 deletions
diff --git a/docs/markdown/Adding-arguments.md b/docs/markdown/Adding-arguments.md
index 117622b..8dd8488 100644
--- a/docs/markdown/Adding-arguments.md
+++ b/docs/markdown/Adding-arguments.md
@@ -37,6 +37,19 @@ You should set only the most essential flags with this setting, you
should *not* set debug or optimization flags. Instead they should be
specified by selecting an appropriate build type.
+Project arguments
+--
+
+Project arguments work similar to global arguments except that they
+are valid only within the current subproject. The usage is simple:
+
+```meson
+add_project_arguments('-DMYPROJ=projname', language : 'c')
+```
+
+This would add the compiler flags to all C sources in the current
+project.
+
Per target arguments
--
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index cc4ba9b..e4c9303 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -112,6 +112,14 @@ Note that all these options are also available while running the
`meson test` script for running tests instead of `ninja test` or
`msbuild RUN_TESTS.vcxproj`, etc depending on the backend.
+### assert()
+
+``` meson
+ void assert(*condition*, *message*)
+```
+
+Abort with an error message if `condition` evaluates to `false`.
+
### benchmark()
``` meson
diff --git a/docs/markdown/Videos.md b/docs/markdown/Videos.md
index d9ea34d..8146c6e 100644
--- a/docs/markdown/Videos.md
+++ b/docs/markdown/Videos.md
@@ -4,6 +4,10 @@ short-description: Videos about Meson
# Videos
+ - [Compiling Multi-Million Line C++ Code Bases Effortlessly with the
+ Meson Build system](https://www.youtube.com/watch?v=SCZLnopmYBM),
+ CppCon 2018
+
- [The Meson Build System, 4+ years of work to become an overnight
success](https://www.youtube.com/watch?v=gHdTzdXkhRY), Linux.conf.au 2018