diff options
| author | Martin Hořeňovský | 2017-04-28 20:27:10 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2017-04-28 20:27:10 +0200 |
| commit | 9ceae8f51fac4ffcfb70bec651af2f1a2a62d968 (patch) | |
| tree | c3aa484bdfd8f72eb7e235a860ce58fde68cb982 | |
| parent | 5ffc8a84cda91b5da037a923480236450f7f4586 (diff) | |
| download | catch3-9ceae8f51fac4ffcfb70bec651af2f1a2a62d968.tar.gz | |
CMake binaries are now conditionally enabled
Defining NO_SELFTEST=1 when cmake configuration is being done now turns
off SelfTest and Benchmark executables. This is for projects that
consume Catch using ExternalProject_Add and don't want to build our
selftest binaries for their unit test suite.
Closes #897
| -rw-r--r-- | CMakeLists.txt | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 95bdf68e..8d39bdb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,28 +245,35 @@ SOURCE_GROUP("Benchmarks" FILES ${BENCH_SOURCES}) # configure the executable include_directories(${HEADER_DIR}) -add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${HEADERS}) -add_executable(Benchmark ${BENCH_SOURCES} ${HEADERS}) -# Add desired warnings -if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" ) - target_compile_options( SelfTest PRIVATE -Wall -Wextra ) - target_compile_options( Benchmark PRIVATE -Wall -Wextra ) -endif() -if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" ) - target_compile_options( SelfTest PRIVATE /W4 /w44265 /WX ) - target_compile_options( Benchmark PRIVATE /W4 ) -endif() +# Projects consuming Catch via ExternalProject_Add might want to use install step +# without building all of our selftests. +if (NOT NO_SELFTEST) + add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${HEADERS}) + add_executable(Benchmark ${BENCH_SOURCES} ${HEADERS}) + + # Add desired warnings + if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" ) + target_compile_options( SelfTest PRIVATE -Wall -Wextra ) + target_compile_options( Benchmark PRIVATE -Wall -Wextra ) + endif() + if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" ) + target_compile_options( SelfTest PRIVATE /W4 /w44265 /WX ) + target_compile_options( Benchmark PRIVATE /W4 ) + endif() + + + # configure unit tests via CTest + enable_testing() + add_test(NAME RunTests COMMAND SelfTest) + add_test(NAME ListTests COMMAND SelfTest --list-tests) + set_tests_properties(ListTests PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ test cases") -# configure unit tests via CTest -enable_testing() -add_test(NAME RunTests COMMAND SelfTest) + add_test(NAME ListTags COMMAND SelfTest --list-tags) + set_tests_properties(ListTags PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ tags") -add_test(NAME ListTests COMMAND SelfTest --list-tests) -set_tests_properties(ListTests PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ test cases") +endif() # !NO_SELFTEST -add_test(NAME ListTags COMMAND SelfTest --list-tags) -set_tests_properties(ListTags PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ tags") install(DIRECTORY "single_include/" DESTINATION "include/catch") |