diff options
| author | Martin Hořeňovský | 2022-10-28 16:01:51 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2022-10-29 21:04:58 +0200 |
| commit | 82cec69e93a90293afae10d826b42aa7e716e934 (patch) | |
| tree | 56cfd0ca4d94a7ef46376b46eb630991767d6849 | |
| parent | b56c4742606c2926f5c9cc6ad2b4ce622b888918 (diff) | |
| download | catch3-82cec69e93a90293afae10d826b42aa7e716e934.tar.gz | |
Don't set C++ standard in CMakeLists for tests
| -rw-r--r-- | examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/ExtraTests/CMakeLists.txt | 13 |
2 files changed, 0 insertions, 15 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 7118482e..f9933341 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -54,8 +54,6 @@ set(ALL_EXAMPLE_TARGETS foreach( name ${ALL_EXAMPLE_TARGETS} ) target_link_libraries( ${name} Catch2 Catch2WithMain ) - set_property(TARGET ${name} PROPERTY CXX_STANDARD 14) - set_property(TARGET ${name} PROPERTY CXX_EXTENSIONS OFF) endforeach() diff --git a/tests/ExtraTests/CMakeLists.txt b/tests/ExtraTests/CMakeLists.txt index c821f9f0..f9630883 100644 --- a/tests/ExtraTests/CMakeLists.txt +++ b/tests/ExtraTests/CMakeLists.txt @@ -242,9 +242,6 @@ set_tests_properties( if (MSVC) # This test fails if it does not compile and succeeds otherwise add_executable(WindowsHeader ${TESTS_DIR}/X90-WindowsHeaderInclusion.cpp) - set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD 14 ) - set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD_REQUIRED ON ) - set_property( TARGET WindowsHeader PROPERTY CXX_EXTENSIONS OFF ) target_link_libraries( WindowsHeader Catch2WithMain ) add_test(NAME WindowsHeader COMMAND WindowsHeader -r compact) list(APPEND CATCH_WARNING_TARGETS ${EXTRA_TEST_BINARIES} WindowsHeader) @@ -514,13 +511,6 @@ set( EXTRA_TEST_BINARIES # DebugBreakMacros ) -# Shared config -foreach( test ${EXTRA_TEST_BINARIES} ) - set_property( TARGET ${test} PROPERTY CXX_STANDARD 14 ) - set_property( TARGET ${test} PROPERTY CXX_STANDARD_REQUIRED ON ) - set_property( TARGET ${test} PROPERTY CXX_EXTENSIONS OFF ) -endforeach() - # Notice that we are modifying EXTRA_TEST_BINARIES destructively, do not # use it after this point! list(FILTER EXTRA_TEST_BINARIES EXCLUDE REGEX "DisabledExceptions.*") @@ -537,9 +527,6 @@ add_executable(AmalgamatedTestCompilation ${CATCH_DIR}/extras/catch_amalgamated.cpp ) target_include_directories(AmalgamatedTestCompilation PRIVATE ${CATCH_DIR}/extras) -set_property( TARGET AmalgamatedTestCompilation PROPERTY CXX_STANDARD 14 ) -set_property( TARGET AmalgamatedTestCompilation PROPERTY CXX_STANDARD_REQUIRED ON ) -set_property( TARGET AmalgamatedTestCompilation PROPERTY CXX_EXTENSIONS OFF ) add_test(NAME AmalgamatedFileTest COMMAND AmalgamatedTestCompilation) set_tests_properties( |