diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/markdown/Builtin-options.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Configuring-a-build-directory.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Dependencies.md | 2 | ||||
| -rw-r--r-- | docs/markdown/Reference-manual.md | 4 | ||||
| -rw-r--r-- | docs/markdown/snippets/generator_with_multiple_outputs_4760.md | 3 | ||||
| -rw-r--r-- | docs/markdown/snippets/warning_level_0.md | 3 |
6 files changed, 11 insertions, 5 deletions
diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md index 0d1a16b..5db6e02 100644 --- a/docs/markdown/Builtin-options.md +++ b/docs/markdown/Builtin-options.md @@ -40,7 +40,7 @@ Installation options are all relative to the prefix, except: | localstatedir | var | Localstate data directory | | sharedstatedir | com | Architecture-independent data directory | | werror | false | Treat warnings as errors | -| warning_level {1, 2, 3} | 1 | Set the warning level. From 1 = lowest to 3 = highest | +| warning_level {0, 1, 2, 3} | 1 | Set the warning level. From 0 = none to 3 = highest | | layout {mirror,flat} | mirror | Build directory layout. | | default_library {shared, static, both} | shared | Default library type. | | backend {ninja, vs,<br>vs2010, vs2015, vs2017, xcode} | | Backend to use (default: ninja). | diff --git a/docs/markdown/Configuring-a-build-directory.md b/docs/markdown/Configuring-a-build-directory.md index 91ad6f7..ddda6fe 100644 --- a/docs/markdown/Configuring-a-build-directory.md +++ b/docs/markdown/Configuring-a-build-directory.md @@ -33,7 +33,7 @@ sample output for a simple project. optimization 3 [0, g, 1, 2, 3, s] Optimization level strip false [true, false] Strip targets on install unity off [on, off, subprojects] Unity build - warning_level 1 [1, 2, 3] Compiler warning level to use + warning_level 1 [0, 1, 2, 3] Compiler warning level to use werror false [true, false] Treat warnings as errors Backend options: diff --git a/docs/markdown/Dependencies.md b/docs/markdown/Dependencies.md index 608f3b2..e243e94 100644 --- a/docs/markdown/Dependencies.md +++ b/docs/markdown/Dependencies.md @@ -427,7 +427,7 @@ include path of the given module(s) to the compiler flags. (since v0.47.0) **Note** using private headers in your project is a bad idea, do so at your own risk. -`method` may be `auto`, `pkgconfig` or `qmake`. +`method` may be `auto`, `pkg-config` or `qmake`. ## SDL2 diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index db43813..4b61ca0 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -2133,8 +2133,8 @@ an external dependency with the following methods: partial dependency with the same rules. So , given: ```meson - dep1 = declare_dependency(compiler_args : '-Werror=foo', link_with : 'libfoo') - dep2 = declare_dependency(compiler_args : '-Werror=bar', dependencies : dep1) + dep1 = declare_dependency(compile_args : '-Werror=foo', link_with : 'libfoo') + dep2 = declare_dependency(compile_args : '-Werror=bar', dependencies : dep1) dep3 = dep2.partial_dependency(compile_args : true) ``` diff --git a/docs/markdown/snippets/generator_with_multiple_outputs_4760.md b/docs/markdown/snippets/generator_with_multiple_outputs_4760.md new file mode 100644 index 0000000..af9a751 --- /dev/null +++ b/docs/markdown/snippets/generator_with_multiple_outputs_4760.md @@ -0,0 +1,3 @@ +## Fix ninja console log from generators with multiple output nodes + +This resolves ticket #4760 where a generator w/ multiple output nodes printed an empty string to the console diff --git a/docs/markdown/snippets/warning_level_0.md b/docs/markdown/snippets/warning_level_0.md new file mode 100644 index 0000000..4836b14 --- /dev/null +++ b/docs/markdown/snippets/warning_level_0.md @@ -0,0 +1,3 @@ +## Add warning_level 0 option + +Adds support for a warning level 0 which does not enable any static analysis checks from the compiler |