From a892ececf8490b21aa8917bc243b2bc441af6a87 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 12 Mar 2019 23:00:11 -0400 Subject: [PATCH] cmake add ECL_TESTS option only enabled in standalone build --- CMakeLists.txt | 1 + validation/CMakeLists.txt | 3 +-- validation/tests/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96af1a9bdd..6751baf0b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) enable_testing() if(BUILD_TESTING) + option(ECL_TESTS "Build ECL tests" ON) add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -C Debug diff --git a/validation/CMakeLists.txt b/validation/CMakeLists.txt index 530ee477ce..d121aeed0d 100644 --- a/validation/CMakeLists.txt +++ b/validation/CMakeLists.txt @@ -39,9 +39,8 @@ add_dependencies(ecl_validation prebuild_targets) target_compile_definitions(ecl_validation PRIVATE -DMODULE_NAME="ecl/validation") target_include_directories(ecl_validation PUBLIC ${ECL_SOURCE_DIR}) -if(BUILD_TESTING) +if(ECL_TESTS) add_definitions(-UNDEBUG) # keep assert add_subdirectory(tests) endif() - diff --git a/validation/tests/CMakeLists.txt b/validation/tests/CMakeLists.txt index 2c4d41f6fd..e314cb38d8 100644 --- a/validation/tests/CMakeLists.txt +++ b/validation/tests/CMakeLists.txt @@ -35,5 +35,5 @@ add_executable(ecl_tests_data_validator test_data_validator.cpp) target_link_libraries(ecl_tests_data_validator ecl_validation) add_test(NAME ecl_tests_data_validator - COMMAND ecl_tests_data_validator - ) + COMMAND ecl_tests_data_validator +)