diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-24 19:52:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-24 19:52:03 (GMT) |
| commit | 9f7b60969009c643dfa411b5f786b855078a6541 (patch) | |
| tree | 6e8bfd505a483ab090f6b527abb314d39a2d55d1 | |
| parent | d81c4db489d773e4a1ce6be49eb9c41582e68ae3 (diff) | |
| parent | a834bcaa9100f552b7f40e2f439fe3afc972e2f1 (diff) | |
| download | CMake-9f7b60969009c643dfa411b5f786b855078a6541.zip CMake-9f7b60969009c643dfa411b5f786b855078a6541.tar.gz CMake-9f7b60969009c643dfa411b5f786b855078a6541.tar.bz2 | |
Merge branch 'fix-no-testing' into release-3.13
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 20ee36c..998db15 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 8e0378c..636530e 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() |