summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorRobert Maynard <robert.maynard@kitware.com>2019-06-25 15:03:24 (GMT)
committerRobert Maynard <robert.maynard@kitware.com>2019-07-11 12:28:35 (GMT)
commitcd681f1f414487978009bf489607325c2966824b (patch)
tree242f10145eddedbae8bd4b6a99073b7640642d99 /Help
parentd2ac3e3e59c8bb9955e65b3964857c58f4ef208a (diff)
downloadCMake-cd681f1f414487978009bf489607325c2966824b.zip
CMake-cd681f1f414487978009bf489607325c2966824b.tar.gz
CMake-cd681f1f414487978009bf489607325c2966824b.tar.bz2
ctest: propagate make program to cmake
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/ctest.1.rst3
-rw-r--r--Help/release/dev/ctest-build-makeprogram-propagated-configure-pass.rst6
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.