diff --git a/CMakeLists.txt b/CMakeLists.txt index f2d98806..577597b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -235,7 +235,7 @@ endif() add_compile_options( $<$:-std=gnu99> - $<$:-std=gnu++14> + $<$:-std=gnu++17> -Wall -Wextra # -pedantic diff --git a/automotive-dlt-c++.pc.in b/automotive-dlt-c++.pc.in index 895d943f..68926a5f 100644 --- a/automotive-dlt-c++.pc.in +++ b/automotive-dlt-c++.pc.in @@ -5,4 +5,4 @@ Name: DLT C++ Description: Diagnostic Log and Trace C++ extensions Version: @PROJECT_VERSION@ Requires: automotive-dlt -Cflags: -std=gnu++0x +Cflags: -std=gnu++17 diff --git a/googletest b/googletest index f8d7d77c..52eb8108 160000 --- a/googletest +++ b/googletest @@ -1 +1 @@ -Subproject commit f8d7d77c06936315286eb55f8de22cd23c188571 +Subproject commit 52eb8108c5bdec04579160ae17225d66034bd723 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fa75fdc9..a6761e94 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,5 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isystem ${gtest_SOURCE_DIR}/include") -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${gtest_SOURCE_DIR}/include -std=gnu++0x") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${gtest_SOURCE_DIR}/include -std=gnu++17") configure_file(${PROJECT_SOURCE_DIR}/tests/testfile.dlt ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) configure_file(${PROJECT_SOURCE_DIR}/tests/testfilter.txt ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)