Browse Source

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
pull/324/head
Brad King 7 years ago
committed by Kitware Robot
parent
commit
89ab893469
  1. 7
      CMakeLists.txt
  2. 2
      Utilities/cmcurl/CMakeLists.txt

7
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.

2
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()

Loading…
Cancel
Save