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 8dfc9e65a3cf823566d8045455d253d7aaf810c0 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <locutusofborg@debian.org>
Date: Wed, 24 Dec 2025 08:33:09 +0100
Subject: [PATCH 1/2] 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/CMakeLists.txt
===================================================================
--- dlt-daemon.orig/CMakeLists.txt
+++ dlt-daemon/CMakeLists.txt
@@ -247,7 +247,7 @@ endif()
add_compile_options(
$<$<COMPILE_LANGUAGE:C>:-std=gnu11>
- $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14>
+ $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
-Wall
-Wextra
-pedantic
Index: dlt-daemon/automotive-dlt-c++.pc.in
===================================================================
--- dlt-daemon.orig/automotive-dlt-c++.pc.in
+++ dlt-daemon/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/tests/CMakeLists.txt
===================================================================
--- dlt-daemon.orig/tests/CMakeLists.txt
+++ dlt-daemon/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
# Setup testing
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/testfile-v2.dlt ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
|
