3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set CMakeLists to default to C++14 for our internal projects

Browse Source
This commit is contained in:
Martin Hořeňovský 2019-11-06 11:59:50 +01:00
parent 6ddd84a67a
commit d6f7f1fbed
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/CMakeLists.txt
View File

@ -138,7 +138,7 @@ add_executable( 207-Rpt-TeamCityReporter ${EXAMPLES_DIR}/207-Rpt-TeamCityReporte
foreach( name ${TARGETS_ALL} ) foreach( name ${TARGETS_ALL} )
target_include_directories( ${name} PRIVATE ${HEADER_DIR} ${CATCH_DIR} ) target_include_directories( ${name} PRIVATE ${HEADER_DIR} ${CATCH_DIR} )
set_property(TARGET ${name} PROPERTY CXX_STANDARD 11) set_property(TARGET ${name} PROPERTY CXX_STANDARD 14)
set_property(TARGET ${name} PROPERTY CXX_EXTENSIONS OFF) set_property(TARGET ${name} PROPERTY CXX_EXTENSIONS OFF)
# Add desired warnings # Add desired warnings

3
projects/CMakeLists.txt
View File

@ -315,7 +315,7 @@ add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${REPORTER_SOURCES} ${SU
target_include_directories(SelfTest PRIVATE ${HEADER_DIR}) target_include_directories(SelfTest PRIVATE ${HEADER_DIR})
# It took CMake until 3.8 to abandon the doomed approach of enumerating # It took CMake until 3.8 to abandon the doomed approach of enumerating
# required features so we just list C++11 features to support older ones. # required features so we just list bunch of C++11 and C++14 features.
target_compile_features(SelfTest target_compile_features(SelfTest
PRIVATE PRIVATE
cxx_alignas cxx_alignas
@ -337,6 +337,7 @@ target_compile_features(SelfTest
cxx_unicode_literals cxx_unicode_literals
cxx_user_literals cxx_user_literals
cxx_variadic_macros cxx_variadic_macros
cxx_variable_templates
) )

4
projects/ExtraTests/CMakeLists.txt
View File

@ -130,7 +130,7 @@ set_tests_properties(
if (MSVC) if (MSVC)
# This test fails if it does not compile and succeeds otherwise # This test fails if it does not compile and succeeds otherwise
add_executable(WindowsHeader ${TESTS_DIR}/X90-WindowsHeaderInclusion.cpp) add_executable(WindowsHeader ${TESTS_DIR}/X90-WindowsHeaderInclusion.cpp)
set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD 11 ) set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD 14 )
set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD_REQUIRED ON ) set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD_REQUIRED ON )
set_property( TARGET WindowsHeader PROPERTY CXX_EXTENSIONS OFF ) set_property( TARGET WindowsHeader PROPERTY CXX_EXTENSIONS OFF )
target_include_directories( WindowsHeader PRIVATE ${SINGLE_INCLUDE_PATH} ) target_include_directories( WindowsHeader PRIVATE ${SINGLE_INCLUDE_PATH} )
@ -149,7 +149,7 @@ set( EXTRA_TEST_BINARIES
# Shared config # Shared config
foreach( test ${EXTRA_TEST_BINARIES} ) foreach( test ${EXTRA_TEST_BINARIES} )
set_property( TARGET ${test} PROPERTY CXX_STANDARD 11 ) set_property( TARGET ${test} PROPERTY CXX_STANDARD 14 )
set_property( TARGET ${test} PROPERTY CXX_STANDARD_REQUIRED ON ) set_property( TARGET ${test} PROPERTY CXX_STANDARD_REQUIRED ON )
set_property( TARGET ${test} PROPERTY CXX_EXTENSIONS OFF ) set_property( TARGET ${test} PROPERTY CXX_EXTENSIONS OFF )
target_include_directories( ${test} PRIVATE ${SINGLE_INCLUDE_PATH} ) target_include_directories( ${test} PRIVATE ${SINGLE_INCLUDE_PATH} )