diff --git a/reference/conanfile/tools/cmake.rst b/reference/conanfile/tools/cmake.rst index 8585a395742..ad3420b2fd5 100644 --- a/reference/conanfile/tools/cmake.rst +++ b/reference/conanfile/tools/cmake.rst @@ -317,3 +317,9 @@ conf - ``tools.microsoft.msbuild:verbosity`` will accept one of ``"Quiet", "Minimal", "Normal", "Detailed", "Diagnostic"`` to be passed to the ``CMake.build()`` command, when a Visual Studio generator (MSBuild build system) is being used for CMake. It is passed as an argument to the underlying build system via the call ``cmake --build . --config Release -- /verbosity:Diagnostic`` + +- ``tools.ninja:jobs`` argument for the ``--jobs`` parameter when running Ninja generator. (overrides + the general ``tools.build:processes``). + +- ``tools.microsoft.msbuild:max_cpu_count`` argument for the ``/m`` (``/maxCpuCount``) when running + ``MSBuild`` (overrides the general ``tools.build:processes``). diff --git a/reference/conanfile/tools/gnu.rst b/reference/conanfile/tools/gnu.rst index 213d17d53bd..60baf16956c 100644 --- a/reference/conanfile/tools/gnu.rst +++ b/reference/conanfile/tools/gnu.rst @@ -156,6 +156,11 @@ consistent conventions and strategy, however they are currently completely independent from each other. Thus, you can use this toolchain without using the ``MakeGenerator``. +conf +++++ + +- ``tools.gnu.make:jobs``: argument for the ``--jobs`` parameter when running ``make`` + (overrides the general ``tools.build:processes``). Using the toolchain in developer flow +++++++++++++++++++++++++++++++++++++ diff --git a/reference/conanfile/tools/meson.rst b/reference/conanfile/tools/meson.rst index b0753be2756..7879b48991d 100644 --- a/reference/conanfile/tools/meson.rst +++ b/reference/conanfile/tools/meson.rst @@ -187,3 +187,9 @@ test() def test(self): Runs project's tests. Equivalent to running :command:`meson test -v -C .` in the build folder.. + +conf +++++ + +- ``tools.ninja:jobs`` argument for the ``--jobs`` parameter when running Ninja. (overrides + the general ``tools.build:processes``). diff --git a/reference/config_files/global_conf.rst b/reference/config_files/global_conf.rst index 9773bb090ca..d2b9a75ed5f 100644 --- a/reference/config_files/global_conf.rst +++ b/reference/config_files/global_conf.rst @@ -31,10 +31,25 @@ have priority over globally defined ones in *global.conf*, and can be defined as [conf] tools.microsoft.msbuild:verbosity=Diagnostic - + tools.microsoft.msbuild:max_cpu_count=20 + tools.build:processes=10 + tools.ninja:jobs=30 + tools.gnu.make:jobs=40 Existing configurations: -- ``tools.microsoft.msbuild:verbosity`` allows defining a value from ``"Quiet", "Minimal", "Normal", "Detailed", "Diagnostic"`` for build using the - MSBuild system, it could be with the ``tools.microsoft.MSBuild`` or with the ``tools.cmake.CMake`` helpers. +- ``tools.microsoft.msbuild:verbosity`` allows defining a value from ``"Quiet", "Minimal", "Normal", + "Detailed", "Diagnostic"`` for build using the + MSBuild system, it could be with the ``tools.microsoft.MSBuild`` or with the ``tools.cmake.CMake`` + helpers. + +- ``tools.microsoft.msbuild:max_cpu_count`` argument for the ``/m`` (``/maxCpuCount``) when running + ``MSBuild`` standalone or via CMake (overrides the general ``tools.build:processes``). + +- ``tools.build:processes``: number of processes to use for every build-helper. + +- ``tools.ninja:jobs`` argument for the ``--jobs`` parameter when running Ninja generator via CMake + or Meson. (overrides the general ``tools.build:processes``). +- ``tools.gnu.make:jobs``: argument for the ``--jobs`` parameter when running ``make`` + (overrides the general ``tools.build:processes``).