diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-29 14:02:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-29 14:05:09 (GMT) |
| commit | f248f8ad7898816a5a627e288d3a04fed993967f (patch) | |
| tree | 39474bb70be2d89d344e55ba4aa5def19905ee28 /Help | |
| parent | 42752d0c11df67a9ca4f5e71efa58965c58552f8 (diff) | |
| parent | 1ab3881ec9e809ac5f6cad5cd84048310b8683e2 (diff) | |
| download | CMake-f248f8ad7898816a5a627e288d3a04fed993967f.zip CMake-f248f8ad7898816a5a627e288d3a04fed993967f.tar.gz CMake-f248f8ad7898816a5a627e288d3a04fed993967f.tar.bz2 | |
Merge topic 'parallel_build_option'
1ab3881ec9 cmake: Add options for parallel builds to --build mode
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !1962
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst | 9 | ||||
| -rw-r--r-- | Help/manual/cmake-env-variables.7.rst | 1 | ||||
| -rw-r--r-- | Help/manual/cmake.1.rst | 7 | ||||
| -rw-r--r-- | Help/release/dev/parallel_build_option.rst | 6 |
4 files changed, 23 insertions, 0 deletions
diff --git a/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst b/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst new file mode 100644 index 0000000..198dc51 --- /dev/null +++ b/Help/envvar/CMAKE_BUILD_PARALLEL_LEVEL.rst @@ -0,0 +1,9 @@ +CMAKE_BUILD_PARALLEL_LEVEL +-------------------------- + +Specifies the maximum number of concurrent processes to use when building +using the ``cmake --build`` command line +:ref:`Build Tool Mode <Build Tool Mode>`. + +If this variable is defined empty the native build tool's default number is +used. diff --git a/Help/manual/cmake-env-variables.7.rst b/Help/manual/cmake-env-variables.7.rst index 2d8869f..2d17bb5 100644 --- a/Help/manual/cmake-env-variables.7.rst +++ b/Help/manual/cmake-env-variables.7.rst @@ -13,6 +13,7 @@ Environment Variables that Control the Build .. toctree:: :maxdepth: 1 + /envvar/CMAKE_BUILD_PARALLEL_LEVEL /envvar/CMAKE_CONFIG_TYPE /envvar/CMAKE_MSVCIDE_RUN_PATH /envvar/CMAKE_OSX_ARCHITECTURES diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 577d321..177acd4 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -159,6 +159,13 @@ following options: ``--build <dir>`` Project binary directory to be built. This is required and must be first. +``-j [<jobs>], --parallel [<jobs>]`` + The maximum number of concurrent processes to use when building. + If ``<jobs>`` is omitted the native build tool's default number is used. + + The :envvar:`CMAKE_BUILD_PARALLEL_LEVEL` environment variable, if set, + specifies a default parallel level when this option is not given. + ``--target <tgt>`` Build ``<tgt>`` instead of default targets. May only be specified once. diff --git a/Help/release/dev/parallel_build_option.rst b/Help/release/dev/parallel_build_option.rst new file mode 100644 index 0000000..2451fd0 --- /dev/null +++ b/Help/release/dev/parallel_build_option.rst @@ -0,0 +1,6 @@ +parallel_build_option +--------------------- + +* The :manual:`cmake(1)` :ref:`Build Tool Mode` (``cmake --build``) gained + ``--parallel [<jobs>]`` and ``-j [<jobs>]`` options to specify a parallel + build level. They map to corresponding options of the native build tool. |