Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2024-11-22_01-35-36_master-next_aws-iot-fleetwise-edge #10461

Merged
merged 1 commit into from
Nov 22, 2024
Merged

2024-11-22_01-35-36_master-next_aws-iot-fleetwise-edge #10461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...fleetwise/aws-iot-fleetwise-edge_1.1.2.bb → ...fleetwise/aws-iot-fleetwise-edge_1.2.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SRC_URI = "\
file://run-ptest \
"

SRCREV = "aa07b246f089b1252e83c40eb2af1e43c3a99967"
SRCREV = "4c74c61a5001037f3979f6dbe74a72abd2ec4e76"

S = "${WORKDIR}/git"

Expand Down
11 changes: 6 additions & 5 deletions recipes-iot/aws-iot-fleetwise/files/remove-cxx-standard.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From be982a8f5ac9a289c955b1442b4ae582f81254bf Mon Sep 17 00:00:00 2001
From e761fd850f0004ad99c7ad69027c6c48f8dcf2ac Mon Sep 17 00:00:00 2001
From: Thomas Roos <[email protected]>
Date: Tue, 9 Jan 2024 15:01:35 +0000
Subject: [PATCH] aws-iot-fleetwise-edge: remove setting of cxx-standard
Expand All @@ -9,17 +9,18 @@ Upstream-Status: Submitted [author]
1 file changed, 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f6c041..8b74eae 100644
index 100989c..23d0962 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,11 +4,6 @@ cmake_minimum_required(VERSION 3.10.2)

project(iotfleetwise VERSION 1.1.2)

project(iotfleetwise VERSION 1.2.0)
-# FWE uses C++14 for compatibility reasons with Automotive middlewares (Adaptive AUTOSAR, ROS2)
-# Note: When built with FWE_FEATURE_ROS2, colcon will override these settings
-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
-
# Print out the compile commands which is useful for IDEs
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

Loading