diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-25 11:25:05 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-25 07:25:13 -0400 |
| commit | 89ab893469576e3cd164019b80bc96daee2ce9b1 (patch) | |
| tree | eb631f0872784b4b33a81562d9a8bf4f436e618f | |
| parent | 60264705b945f9b1f91c58a52c2974c1399a97b0 (diff) | |
| parent | a834bcaa9100f552b7f40e2f439fe3afc972e2f1 (diff) | |
| download | cmake-89ab893469576e3cd164019b80bc96daee2ce9b1.tar.gz | |
Merge topic 'fix-no-testing'
a834bcaa91 Tests: Add missing BUILD_TESTING conditions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dan Ibanez <daibane@sandia.gov>
Merge-request: !2520
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c35bc2e4e3..e94503c887 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -791,9 +791,10 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE) endif() endif() -# add a test -add_test(SystemInformationNew "${CMAKE_CMAKE_COMMAND}" - --system-information -G "${CMAKE_GENERATOR}" ) +if(BUILD_TESTING) + add_test(SystemInformationNew "${CMAKE_CMAKE_COMMAND}" + --system-information -G "${CMAKE_GENERATOR}" ) +endif() if(NOT CMake_TEST_EXTERNAL_CMAKE) # Install license file as it requires. diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 8e0378ce47..636530e2f8 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -1289,7 +1289,7 @@ endif() add_executable(LIBCURL curltest.c) target_link_libraries(LIBCURL cmcurl) -if(CMAKE_CURL_TEST_URL) +if(BUILD_TESTING AND CMAKE_CURL_TEST_URL) add_test(curl LIBCURL ${CMAKE_CURL_TEST_URL}) endif() |