Skip to content

Commit

Permalink
aws-iot-fleetwise-edge: upgrade 1.1.2 -> 1.2.0
Browse files Browse the repository at this point in the history
(cherry picked from commit e9ba390)
  • Loading branch information
aws-iot-embedded-linux-ci authored and thomas-roos committed Nov 22, 2024
1 parent 30fb0ed commit 2434266
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
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
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)

0 comments on commit 2434266

Please sign in to comment.