-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
aws-iot-fleetwise-edge: upgrade 1.1.2 -> 1.2.0
- Loading branch information
1 parent
69f9619
commit e9ba390
Showing
2 changed files
with
7 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
@@ -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) | ||
|