1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
|
From 7396d401a2da73c61fc000eea589893b9a51101f Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <locutusofborg@debian.org>
Date: Mon, 8 Sep 2025 13:20:33 +0200
Subject: [PATCH] Update CMakeLists.txt: set required std version to gnu++17,
needed for new googletest version
---
CMakeLists.txt | 2 +-
automotive-dlt-c++.pc.in | 2 +-
tests/CMakeLists.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Index: dlt-daemon-2.18.10/CMakeLists.txt
===================================================================
--- dlt-daemon-2.18.10.orig/CMakeLists.txt
+++ dlt-daemon-2.18.10/CMakeLists.txt
@@ -219,7 +219,7 @@ endif()
add_compile_options(
$<$<COMPILE_LANGUAGE:C>:-std=gnu99>
- $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14>
+ $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
-Wall
-Wextra
# -pedantic
Index: dlt-daemon-2.18.10/automotive-dlt-c++.pc.in
===================================================================
--- dlt-daemon-2.18.10.orig/automotive-dlt-c++.pc.in
+++ dlt-daemon-2.18.10/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
Index: dlt-daemon-2.18.10/tests/CMakeLists.txt
===================================================================
--- dlt-daemon-2.18.10.orig/tests/CMakeLists.txt
+++ dlt-daemon-2.18.10/tests/CMakeLists.txt
@@ -2,7 +2,7 @@
enable_testing()
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)
|