summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-03-08 14:35:37 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-03-08 14:37:56 (GMT)
commit18ff7cc34f5769bd14ba2893b54647f9b639f847 (patch)
tree8e9d4444eefa8251968da621f5f28464a49e8230
parent8145876a1f17eb13878d6b9e0f45662e8873fddf (diff)
parent538e699e5a981012181e2f1a76a96848fef50caa (diff)
downloadCMake-18ff7cc34f5769bd14ba2893b54647f9b639f847.zip
CMake-18ff7cc34f5769bd14ba2893b54647f9b639f847.tar.gz
CMake-18ff7cc34f5769bd14ba2893b54647f9b639f847.tar.bz2
Merge topic 'enable_testing'
538e699e5a Help: for command enable_testing, explain relation to module CTest. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3070
-rw-r--r--Help/command/add_test.rst3
-rw-r--r--Help/command/enable_testing.rst15
2 files changed, 13 insertions, 5 deletions
diff --git a/Help/command/add_test.rst b/Help/command/add_test.rst
index a8c257d..46b9b63 100644
--- a/Help/command/add_test.rst
+++ b/Help/command/add_test.rst
@@ -55,7 +55,8 @@ file produced by target ``myexe``.
CMake will generate tests only if the :command:`enable_testing`
command has been invoked. The :module:`CTest` module invokes the
- command automatically when the ``BUILD_TESTING`` option is ``ON``.
+ command automatically unless the ``BUILD_TESTING`` option is turned
+ ``OFF``.
---------------------------------------------------------------------
diff --git a/Help/command/enable_testing.rst b/Help/command/enable_testing.rst
index e2028d2..3ac1a19 100644
--- a/Help/command/enable_testing.rst
+++ b/Help/command/enable_testing.rst
@@ -7,7 +7,14 @@ Enable testing for current directory and below.
enable_testing()
-Enables testing for this directory and below. See also the
-:command:`add_test` command. Note that ctest expects to find a test file
-in the build directory root. Therefore, this command should be in the
-source directory root.
+Enables testing for this directory and below.
+
+This command should be in the source directory root
+because ctest expects to find a test file in the build
+directory root.
+
+This command is automatically invoked when the :module:`CTest`
+module is included, except if the ``BUILD_TESTING`` option is
+turned off.
+
+See also the :command:`add_test` command.