diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-12 20:10:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-12 20:10:32 (GMT) |
| commit | 82a72bfc1b90373c936c5010ece28423906e1e74 (patch) | |
| tree | a29f8d6c4c6318dd48d1b3c5329577a9bfd152bf /Help | |
| parent | f9e0cf64176628d07871741da2c6f585f52c4e39 (diff) | |
| parent | cd681f1f414487978009bf489607325c2966824b (diff) | |
| download | CMake-82a72bfc1b90373c936c5010ece28423906e1e74.zip CMake-82a72bfc1b90373c936c5010ece28423906e1e74.tar.gz CMake-82a72bfc1b90373c936c5010ece28423906e1e74.tar.bz2 | |
Merge topic 'ctest_make_program__propagated_to_cmake_configure_pass'
cd681f1f41 ctest: propagate make program to cmake
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3483
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/ctest.1.rst | 3 | ||||
| -rw-r--r-- | Help/release/dev/ctest-build-makeprogram-propagated-configure-pass.rst | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index 5773176..c6b1425 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -443,7 +443,8 @@ this mode include: Specify the name of the project to build. ``--build-makeprogram`` - Override the make program chosen by CTest with a given one. + Specify the explicit make program to be used by CMake when configuring and + building the project. Only applicable for Make and Ninja based generators. ``--build-noclean`` Skip the make clean step. diff --git a/Help/release/dev/ctest-build-makeprogram-propagated-configure-pass.rst b/Help/release/dev/ctest-build-makeprogram-propagated-configure-pass.rst new file mode 100644 index 0000000..4465de8 --- /dev/null +++ b/Help/release/dev/ctest-build-makeprogram-propagated-configure-pass.rst @@ -0,0 +1,6 @@ +ctest-build-makeprogram-propagated-configure-pass +------------------------------------------------- + +* :manual:`ctest(1)` ``--build-makeprogram`` now specifies the make program + used when configuring a project with the Ninja and Makefiles generators + in addition to building it. |