Skip to content

Commit 9f47d0b

Browse files
author
github-actions
committed
Update
1 parent 1188fed commit 9f47d0b

25 files changed

+22
-25
lines changed

Build-options.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ <h2 id="using-build-options">Using build options</h2>
375375
a colon:</p>
376376
<pre><code class="language-console">$ meson configure -Dsubproject:option=newvalue
377377
</code></pre>
378-
<p><strong>NOTE:</strong> If you cannot call <code>meson configure</code> you likely have a old
378+
<p><strong>NOTE:</strong> If you cannot call <code>meson configure</code> you likely have an old
379379
version of Meson. In that case you can call <code>mesonconf</code> instead, but
380380
that is deprecated in newer versions</p>
381381
<h2 id="yielding-to-superproject-option">Yielding to superproject option</h2>

Builtin-options.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ <h3 id="core-options">Core options</h3>
359359
<tr>
360360
<td> genvslite {vs2022}</td>
361361
<td> vs2022</td>
362-
<td> Setup multi-builtype ninja build directories and Visual Studio solution</td>
362+
<td> Setup multi-buildtype ninja build directories and Visual Studio solution</td>
363363
<td> no</td>
364364
<td> no</td>
365365
</tr>
@@ -520,7 +520,7 @@ <h4 id="details-for-genvslite">Details for <code>genvslite</code>
520520
<p>Setup multiple buildtype-suffixed, ninja-backend build directories (e.g.
521521
[builddir]_[debug/release/etc.]) and generate [builddir]_vs containing a Visual
522522
Studio solution with multiple configurations that invoke a meson compile of the
523-
setup build directories, as appropriate for the current configuration (builtype).</p>
523+
setup build directories, as appropriate for the current configuration (buildtype).</p>
524524
<p>This has the effect of a simple setup macro of multiple 'meson setup ...'
525525
invocations with a set of different buildtype values. E.g.
526526
<code>meson setup ... --genvslite vs2022 somebuilddir</code> does the following -</p>
@@ -580,7 +580,7 @@ <h4 id="details-for-buildtype">Details for <code>buildtype</code>
580580
<p>All other combinations of <code>debug</code> and <code>optimization</code> set <code>buildtype</code> to <code>'custom'</code>.</p>
581581
<h4 id="details-for-warning_level">Details for <code>warning_level</code>
582582
</h4>
583-
<p>Exact flags per warning level is compiler specific, but there is an approximative
583+
<p>Exact flags per warning level is compiler specific, but there is an approximate
584584
table for most common compilers.</p>
585585
<table>
586586
<thead>

FAQ.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ <h2 id="does-wrap-download-sources-behind-my-back">Does wrap download sources be
424424
or they are not called (due to e.g. <code>if/else</code>) then nothing is
425425
downloaded.</p>
426426
<p>If this is not sufficient for you, starting from release 0.40.0 Meson
427-
has a option called <code>wrap-mode</code> which can be used to disable wrap
427+
has an option called <code>wrap-mode</code> which can be used to disable wrap
428428
downloads altogether with <code>--wrap-mode=nodownload</code>. You can also
429429
disable dependency fallbacks altogether with <code>--wrap-mode=nofallback</code>,
430430
which also implies the <code>nodownload</code> option.</p>

IDE-integration.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ <h1 id="ide-integration">IDE integration</h1>
217217
this problem, Meson provides an API that makes it easy for any IDE or
218218
build tools to integrate Meson builds and provide an experience
219219
comparable to a solution native to the IDE.</p>
220-
<p>All the resources required for such a IDE integration can be found in
220+
<p>All the resources required for such an IDE integration can be found in
221221
the <code>meson-info</code> directory in the build directory.</p>
222222
<p>The first thing to do when setting up a Meson project in an IDE is to
223223
select the source and build directories. For this example we assume

Include-directories.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ <h1 id="include-directories">Include directories</h1>
215215
<p>Most <code>C</code>/<code>C++</code> projects have headers in different directories than
216216
sources. Thus you need to specify include directories. Let's assume
217217
that we are at some subdirectory and wish to add its <code>include</code>
218-
subdirectory to some target's search path. To create a include
218+
subdirectory to some target's search path. To create an include
219219
directory object we do this:</p>
220220
<pre><code class="language-meson">incdir = include_directories('include')
221221
</code></pre>

Qt6-module.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ <h2 id="compile_moc">compile_moc</h2>
294294
it generates a file <code>{target private directory}/subdir/one.out</code> when <code>true</code>,
295295
and <code>{target private directory}/one.out</code> when <code>false</code> (default).</li>
296296
<li>
297-
<code>output_json</code> bool: <em>New in 1.7.0</em>. If <code>true</code>, generates additionnaly a
297+
<code>output_json</code> bool: <em>New in 1.7.0</em>. If <code>true</code>, generates additionally a
298298
JSON representation which may be used by external tools such as qmltyperegistrar</li>
299299
</ul>
300300
<h2 id="preprocess">preprocess</h2>

Unit-tests.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ <h3 id="other-test-options">Other test options</h3>
411411
<p>For further information see the command line help of Meson by running
412412
<code>meson test -h</code>.</p>
413413
<h2 id="legacy-notes">Legacy notes</h2>
414-
<p>If <code>meson test</code> does not work for you, you likely have a old version
414+
<p>If <code>meson test</code> does not work for you, you likely have an old version
415415
of Meson. In that case you should call <code>mesontest</code> instead. If
416416
<code>mesontest</code> doesn't work either you have a very old version prior to
417417
0.37.0 and should upgrade.</p>

assets/js/search/additionally

+1-1
Large diffs are not rendered by default.

assets/js/search/additionnaly

-1
This file was deleted.

assets/js/search/approximate

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
urls_downloaded_cb({"token":"approximate","urls":[{"url":"Builtin-options.html#details-for-warning_level","node_type":"p","page":"Built-in options","sections":["Built-in options","Universal options","Core options","Details for warning_level\n"],"context":{"gi-language":["default"]}}]});

assets/js/search/approximative

-1
This file was deleted.

assets/js/search/builtype

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fragment_downloaded_cb({"url":"Build-options.html#using-build-options","fragment":"Using build options\nThis function also allows you to query the value of Meson's built-in\nproject options. For example, to get the installation prefix you would\nissue the following command:\nIt should be noted that you cannot set option values in your Meson\nscripts. They have to be set externally with the meson configure\ncommand line tool. Running meson configure without arguments in a\nbuild dir shows you all options you can set.\nTo change their values use the -D\noption:\nSetting the value of arrays is a bit special. If you only pass a\nsingle string, then it is considered to have all values separated by\ncommas. Thus invoking the following command:\nwould set the value to an array of two elements, foo and bar.\nIf you need to have commas in your string values, then you need to\npass the value with proper shell quoting like this:\nThe inner values must always be single quotes and the outer ones\ndouble quotes.\nTo change values in subprojects prepend the name of the subproject and\na colon:\nNOTE: If you cannot call meson configure you likely have a old\nversion of Meson. In that case you can call mesonconf instead, but\nthat is deprecated in newer versions\n"});
1+
fragment_downloaded_cb({"url":"Build-options.html#using-build-options","fragment":"Using build options\nThis function also allows you to query the value of Meson's built-in\nproject options. For example, to get the installation prefix you would\nissue the following command:\nIt should be noted that you cannot set option values in your Meson\nscripts. They have to be set externally with the meson configure\ncommand line tool. Running meson configure without arguments in a\nbuild dir shows you all options you can set.\nTo change their values use the -D\noption:\nSetting the value of arrays is a bit special. If you only pass a\nsingle string, then it is considered to have all values separated by\ncommas. Thus invoking the following command:\nwould set the value to an array of two elements, foo and bar.\nIf you need to have commas in your string values, then you need to\npass the value with proper shell quoting like this:\nThe inner values must always be single quotes and the outer ones\ndouble quotes.\nTo change values in subprojects prepend the name of the subproject and\na colon:\nNOTE: If you cannot call meson configure you likely have an old\nversion of Meson. In that case you can call mesonconf instead, but\nthat is deprecated in newer versions\n"});
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fragment_downloaded_cb({"url":"Builtin-options.html#core-options","fragment":"Core options\nOptions that are labeled \"per machine\" in the table are set per\nmachine. See the specifying options per\nmachine section for details.\n(For the Rust language only, warning_level=0 disables all warnings).\n\n\n\n Option\n Default value\n Description\n Is per machine\n Is per subproject\n\n\n\n\n auto_features {enabled, disabled, auto}\n auto\n Override value of all 'auto' features\n no\n no\n\n\n backend {ninja, vs,vs2010, vs2012, vs2013, vs2015, vs2017, vs2019, vs2022, xcode, none}\n ninja\n Backend to use\n no\n no\n\n\n genvslite {vs2022}\n vs2022\n Setup multi-builtype ninja build directories and Visual Studio solution\n no\n no\n\n\n buildtype {plain, debug,debugoptimized, release, minsize, custom}\n debug\n Build type to use\n no\n no\n\n\n debug\n true\n Enable debug symbols and other information\n no\n no\n\n\n default_both_libraries {shared, static, auto}\n shared\n Default library type for both_libraries\n no\n no\n\n\n default_library {shared, static, both}\n shared\n Default library type\n no\n yes\n\n\n errorlogs\n true\n Whether to print the logs from failing tests.\n no\n no\n\n\n install_umask {preserve, 0000-0777}\n 022\n Default umask to apply on permissions of installed files\n no\n no\n\n\n layout {mirror,flat}\n mirror\n Build directory layout\n no\n no\n\n\n optimization {plain, 0, g, 1, 2, 3, s}\n 0\n Optimization level\n no\n no\n\n\n pkg_config_path {OS separated path}\n ''\n Additional paths for pkg-config to search before builtin paths\n yes\n no\n\n\n prefer_static\n false\n Whether to try static linking before shared linking\n no\n no\n\n\n cmake_prefix_path\n []\n Additional prefixes for cmake to search before builtin paths\n yes\n no\n\n\n stdsplit\n true\n Split stdout and stderr in test logs\n no\n no\n\n\n strip\n false\n Strip targets on install\n no\n no\n\n\n unity {on, off, subprojects}\n off\n Unity build\n no\n no\n\n\n unity_size {>=2}\n 4\n Unity file block size\n no\n no\n\n\n warning_level {0, 1, 2, 3, everything}\n 1\n Set the warning level. From 0 = compiler default to everything = highest\n no\n yes\n\n\n werror\n false\n Treat warnings as errors\n no\n yes\n\n\n wrap_mode {default, nofallback,nodownload, forcefallback, nopromote}\n default\n Wrap mode to use\n no\n no\n\n\n force_fallback_for\n []\n Force fallback for those dependencies\n no\n no\n\n\n vsenv\n false\n Activate Visual Studio environment\n no\n no\n\n\n\n"});
1+
fragment_downloaded_cb({"url":"Builtin-options.html#core-options","fragment":"Core options\nOptions that are labeled \"per machine\" in the table are set per\nmachine. See the specifying options per\nmachine section for details.\n(For the Rust language only, warning_level=0 disables all warnings).\n\n\n\n Option\n Default value\n Description\n Is per machine\n Is per subproject\n\n\n\n\n auto_features {enabled, disabled, auto}\n auto\n Override value of all 'auto' features\n no\n no\n\n\n backend {ninja, vs,vs2010, vs2012, vs2013, vs2015, vs2017, vs2019, vs2022, xcode, none}\n ninja\n Backend to use\n no\n no\n\n\n genvslite {vs2022}\n vs2022\n Setup multi-buildtype ninja build directories and Visual Studio solution\n no\n no\n\n\n buildtype {plain, debug,debugoptimized, release, minsize, custom}\n debug\n Build type to use\n no\n no\n\n\n debug\n true\n Enable debug symbols and other information\n no\n no\n\n\n default_both_libraries {shared, static, auto}\n shared\n Default library type for both_libraries\n no\n no\n\n\n default_library {shared, static, both}\n shared\n Default library type\n no\n yes\n\n\n errorlogs\n true\n Whether to print the logs from failing tests.\n no\n no\n\n\n install_umask {preserve, 0000-0777}\n 022\n Default umask to apply on permissions of installed files\n no\n no\n\n\n layout {mirror,flat}\n mirror\n Build directory layout\n no\n no\n\n\n optimization {plain, 0, g, 1, 2, 3, s}\n 0\n Optimization level\n no\n no\n\n\n pkg_config_path {OS separated path}\n ''\n Additional paths for pkg-config to search before builtin paths\n yes\n no\n\n\n prefer_static\n false\n Whether to try static linking before shared linking\n no\n no\n\n\n cmake_prefix_path\n []\n Additional prefixes for cmake to search before builtin paths\n yes\n no\n\n\n stdsplit\n true\n Split stdout and stderr in test logs\n no\n no\n\n\n strip\n false\n Strip targets on install\n no\n no\n\n\n unity {on, off, subprojects}\n off\n Unity build\n no\n no\n\n\n unity_size {>=2}\n 4\n Unity file block size\n no\n no\n\n\n warning_level {0, 1, 2, 3, everything}\n 1\n Set the warning level. From 0 = compiler default to everything = highest\n no\n yes\n\n\n werror\n false\n Treat warnings as errors\n no\n yes\n\n\n wrap_mode {default, nofallback,nodownload, forcefallback, nopromote}\n default\n Wrap mode to use\n no\n no\n\n\n force_fallback_for\n []\n Force fallback for those dependencies\n no\n no\n\n\n vsenv\n false\n Activate Visual Studio environment\n no\n no\n\n\n\n"});
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fragment_downloaded_cb({"url":"Builtin-options.html#details-for-genvslite","fragment":"Details for genvslite\n\nSetup multiple buildtype-suffixed, ninja-backend build directories (e.g.\n[builddir]_[debug/release/etc.]) and generate [builddir]_vs containing a Visual\nStudio solution with multiple configurations that invoke a meson compile of the\nsetup build directories, as appropriate for the current configuration (builtype).\nThis has the effect of a simple setup macro of multiple 'meson setup ...'\ninvocations with a set of different buildtype values. E.g.\nmeson setup ... --genvslite vs2022 somebuilddir does the following -\nand additionally creates another 'somebuilddir_vs' directory that contains\na generated multi-configuration visual studio solution and project(s) that are\nset to build/compile with the somebuilddir_[...] that's appropriate for the\nsolution's selected buildtype configuration.\n"});
1+
fragment_downloaded_cb({"url":"Builtin-options.html#details-for-genvslite","fragment":"Details for genvslite\n\nSetup multiple buildtype-suffixed, ninja-backend build directories (e.g.\n[builddir]_[debug/release/etc.]) and generate [builddir]_vs containing a Visual\nStudio solution with multiple configurations that invoke a meson compile of the\nsetup build directories, as appropriate for the current configuration (buildtype).\nThis has the effect of a simple setup macro of multiple 'meson setup ...'\ninvocations with a set of different buildtype values. E.g.\nmeson setup ... --genvslite vs2022 somebuilddir does the following -\nand additionally creates another 'somebuilddir_vs' directory that contains\na generated multi-configuration visual studio solution and project(s) that are\nset to build/compile with the somebuilddir_[...] that's appropriate for the\nsolution's selected buildtype configuration.\n"});
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fragment_downloaded_cb({"url":"Builtin-options.html#details-for-warning_level","fragment":"Details for warning_level\n\nExact flags per warning level is compiler specific, but there is an approximative\ntable for most common compilers.\nClang's -Weverything is emulated on GCC by passing all known warning flags.\n\n\n\n Warning level\n GCC/Clang\n MSVC\n\n\n\n\n 0\n\n\n\n\n 1\n -Wall\n /W2\n\n\n 2\n -Wall -Wextra\n /W3\n\n\n 3\n -Wall -Wextra -Wpedantic\n /W4\n\n\n everything\n -Weverything\n /Wall\n\n\n\n"});
1+
fragment_downloaded_cb({"url":"Builtin-options.html#details-for-warning_level","fragment":"Details for warning_level\n\nExact flags per warning level is compiler specific, but there is an approximate\ntable for most common compilers.\nClang's -Weverything is emulated on GCC by passing all known warning flags.\n\n\n\n Warning level\n GCC/Clang\n MSVC\n\n\n\n\n 0\n\n\n\n\n 1\n -Wall\n /W2\n\n\n 2\n -Wall -Wextra\n /W3\n\n\n 3\n -Wall -Wextra -Wpedantic\n /W4\n\n\n everything\n -Weverything\n /Wall\n\n\n\n"});
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fragment_downloaded_cb({"url":"FAQ.html#does-wrap-download-sources-behind-my-back","fragment":"Does wrap download sources behind my back?\nIt does not. In order for Meson to download anything from the net\nwhile building, two conditions must be met.\nFirst of all there needs to be a .wrap file with a download URL in\nthe subprojects directory. If one does not exist, Meson will not\ndownload anything.\nThe second requirement is that there needs to be an explicit\nsubproject invocation in your meson.build files. Either\nsubproject('foobar') or dependency('foobar', fallback : ['foobar', 'foo_dep']). If these declarations either are not in any build file\nor they are not called (due to e.g. if/else) then nothing is\ndownloaded.\nIf this is not sufficient for you, starting from release 0.40.0 Meson\nhas a option called wrap-mode which can be used to disable wrap\ndownloads altogether with --wrap-mode=nodownload. You can also\ndisable dependency fallbacks altogether with --wrap-mode=nofallback,\nwhich also implies the nodownload option.\nIf on the other hand, you want Meson to always use the fallback\nfor dependencies, even when an external dependency exists and could\nsatisfy the version requirements, for example in order to make\nsure your project builds when fallbacks are used, you can use\n--wrap-mode=forcefallback since 0.46.0.\n"});
1+
fragment_downloaded_cb({"url":"FAQ.html#does-wrap-download-sources-behind-my-back","fragment":"Does wrap download sources behind my back?\nIt does not. In order for Meson to download anything from the net\nwhile building, two conditions must be met.\nFirst of all there needs to be a .wrap file with a download URL in\nthe subprojects directory. If one does not exist, Meson will not\ndownload anything.\nThe second requirement is that there needs to be an explicit\nsubproject invocation in your meson.build files. Either\nsubproject('foobar') or dependency('foobar', fallback : ['foobar', 'foo_dep']). If these declarations either are not in any build file\nor they are not called (due to e.g. if/else) then nothing is\ndownloaded.\nIf this is not sufficient for you, starting from release 0.40.0 Meson\nhas an option called wrap-mode which can be used to disable wrap\ndownloads altogether with --wrap-mode=nodownload. You can also\ndisable dependency fallbacks altogether with --wrap-mode=nofallback,\nwhich also implies the nodownload option.\nIf on the other hand, you want Meson to always use the fallback\nfor dependencies, even when an external dependency exists and could\nsatisfy the version requirements, for example in order to make\nsure your project builds when fallbacks are used, you can use\n--wrap-mode=forcefallback since 0.46.0.\n"});

0 commit comments

Comments
 (0)