From d6f7f1fbedc0947027449d516c3fc28399d06e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Wed, 6 Nov 2019 11:59:50 +0100 Subject: [PATCH] Set CMakeLists to default to C++14 for our internal projects --- examples/CMakeLists.txt | 2 +- projects/CMakeLists.txt | 3 ++- projects/ExtraTests/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 65dc5f54..7526e47f 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -138,7 +138,7 @@ add_executable( 207-Rpt-TeamCityReporter ${EXAMPLES_DIR}/207-Rpt-TeamCityReporte foreach( name ${TARGETS_ALL} ) 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) # Add desired warnings diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index 729edd2d..30536ebf 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -315,7 +315,7 @@ add_executable(SelfTest ${TEST_SOURCES} ${IMPL_SOURCES} ${REPORTER_SOURCES} ${SU target_include_directories(SelfTest PRIVATE ${HEADER_DIR}) # 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 PRIVATE cxx_alignas @@ -337,6 +337,7 @@ target_compile_features(SelfTest cxx_unicode_literals cxx_user_literals cxx_variadic_macros + cxx_variable_templates ) diff --git a/projects/ExtraTests/CMakeLists.txt b/projects/ExtraTests/CMakeLists.txt index 13b02870..196199df 100644 --- a/projects/ExtraTests/CMakeLists.txt +++ b/projects/ExtraTests/CMakeLists.txt @@ -130,7 +130,7 @@ 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 11 ) + 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_include_directories( WindowsHeader PRIVATE ${SINGLE_INCLUDE_PATH} ) @@ -149,7 +149,7 @@ set( EXTRA_TEST_BINARIES # Shared config 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_EXTENSIONS OFF ) target_include_directories( ${test} PRIVATE ${SINGLE_INCLUDE_PATH} )