diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-14 10:14:35 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-18 11:30:49 -0500 |
| commit | 96966b5c804a95677e43e3938c52afbd42b5d48a (patch) | |
| tree | e6ec04b9ecf297d615700df84f041d8d3f31bf87 /Help | |
| parent | 91a021146c7a8eb256eca7bb3d9be3acfe3ce814 (diff) | |
| download | cmake-96966b5c804a95677e43e3938c52afbd42b5d48a.tar.gz | |
ctest: Make the --build-makeprogram optional for --build-and-test
GenerateBuildCommand now knows how to lookup CMAKE_MAKE_PROGRAM or
choose a generator-provided default build tool. Therefore the
--build-makeprogram can now be optional and simply override the
default selection when provided.
Note that with --build-nocmake we now need to load the cache in order to
make the CMAKE_MAKE_PROGRAM entry available to GenerateBuildCommand.
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/manual/ctest.1.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst index eee12fdb90..60d08dd137 100644 --- a/Help/manual/ctest.1.rst +++ b/Help/manual/ctest.1.rst @@ -225,8 +225,8 @@ Options and or execute a test. The configure and test steps are optional. The arguments to this command line are the source and binary directories. By default this will run CMake on the Source/Bin - directories specified unless --build-nocmake is specified. Both - --build-makeprogram and --build-generator MUST be provided to use + directories specified unless --build-nocmake is specified. + The --build-generator option *must* be provided to use --build-and-test. If --test-command is specified then that will be run after the build is complete. Other options that affect this mode are --build-target --build-nocmake, --build-run-dir, @@ -265,7 +265,7 @@ Options Specify the name of the project to build. ``--build-makeprogram`` - Specify the make program to use. + Override the make program chosen by CTest with a given one. ``--build-noclean`` Skip the make clean step. |