Merge branch 'master' of https://github.com/eclipse-ecal/ecal into fe…

…ature/gh_action_cleanup
eclipse-ecal · Apr 26, 2024 · dd33fe2 · dd33fe2
2 parents e2596cd + 28279a6
commit dd33fe2
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 16 deletions.
diff --git a/app/mon/mon_gui/src/widgets/models/topic_tree_item.cpp b/app/mon/mon_gui/src/widgets/models/topic_tree_item.cpp
@@ -209,22 +209,25 @@ QVariant TopicTreeItem::data(Columns column, Qt::ItemDataRole role) const
       for (const auto& layer : layer_pb)
       {
         QString this_layer_string;
-        switch (layer.type())
+        if (layer.confirmed())
         {
-        case eCAL::pb::eTLayerType::tl_ecal_tcp:
-          this_layer_string = "tcp";
-          break;
-        case eCAL::pb::eTLayerType::tl_ecal_udp_mc:
-          this_layer_string = "udp_mc";
-          break;
-        case eCAL::pb::eTLayerType::tl_ecal_shm:
-          this_layer_string = "shm";
-          break;
-        case eCAL::pb::eTLayerType::tl_all:
-          this_layer_string = "all";
-          break;
-        default:
-          this_layer_string = ("Unknown (" + QString::number((int)layer.type()) + ")");
+          switch (layer.type())
+          {
+          case eCAL::pb::eTLayerType::tl_ecal_tcp:
+            this_layer_string = "tcp";
+            break;
+          case eCAL::pb::eTLayerType::tl_ecal_udp_mc:
+            this_layer_string = "udp_mc";
+            break;
+          case eCAL::pb::eTLayerType::tl_ecal_shm:
+            this_layer_string = "shm";
+            break;
+          case eCAL::pb::eTLayerType::tl_all:
+            this_layer_string = "all";
+            break;
+          default:
+            this_layer_string = ("Unknown (" + QString::number((int)layer.type()) + ")");
+          }
         }
 
         if (!layer_string.isEmpty() && !this_layer_string.isEmpty())

diff --git a/app/mon/mon_plugins/monitor_tree_view/CMakeLists.txt b/app/mon/mon_plugins/monitor_tree_view/CMakeLists.txt
@@ -18,6 +18,8 @@
 
 project(MonitorTreeView)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 # Legacy Qt5 (pre 5.15) support as suggested by teh Qt Documentation:
 # https://doc.qt.io/qt-6/cmake-qt5-and-qt6-compatibility.html#supporting-older-qt-5-versions
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Widgets)

diff --git a/app/mon/mon_tui/src/model/monitor.hpp b/app/mon/mon_tui/src/model/monitor.hpp
@@ -204,7 +204,10 @@ class MonitorModel
       topic.type_descriptor = std::move(*t.mutable_tdatatype()->mutable_desc());
       for(auto &tl: t.tlayer())
       {
-        topic.transport_layers.emplace_back(TopicTransportLayer(tl.type()));
+        if (tl.confirmed())
+        {
+          topic.transport_layers.emplace_back(TopicTransportLayer(tl.type()));
+        }
       }
       topic.size = t.tsize();
       topic.local_connections_count = t.connections_loc();

diff --git a/ecal/core/include/ecal/ecal_util.h b/ecal/core/include/ecal/ecal_util.h
@@ -27,6 +27,8 @@
 #include <ecal/ecal_os.h>
 #include <ecal/ecal_deprecate.h>
 #include <ecal/ecal_types.h>
+
+#include <cstdint>
 #include <map>
 #include <set>
 #include <string>

diff --git a/lib/CustomQt/CMakeLists.txt b/lib/CustomQt/CMakeLists.txt
@@ -18,6 +18,8 @@
 
 project(CustomQt)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 # Legacy Qt5 (pre 5.15) support as suggested by teh Qt Documentation:
 # https://doc.qt.io/qt-6/cmake-qt5-and-qt6-compatibility.html#supporting-older-qt-5-versions
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Widgets)

diff --git a/lib/CustomTclap/CMakeLists.txt b/lib/CustomTclap/CMakeLists.txt
@@ -18,6 +18,8 @@
 
 project(CustomTclap)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 find_package(tclap REQUIRED)
 
 set(include_files

diff --git a/lib/QEcalParser/CMakeLists.txt b/lib/QEcalParser/CMakeLists.txt
@@ -18,6 +18,8 @@
 
 project(QEcalParser)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 # Legacy Qt5 (pre 5.15) support as suggested by teh Qt Documentation:
 # https://doc.qt.io/qt-6/cmake-qt5-and-qt6-compatibility.html#supporting-older-qt-5-versions
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Widgets)

diff --git a/lib/ThreadingUtils/CMakeLists.txt b/lib/ThreadingUtils/CMakeLists.txt
@@ -18,6 +18,8 @@
 
 project(ThreadingUtils)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 find_package(Threads REQUIRED)
 
 set (threading_utils_includes

diff --git a/lib/ecal_utils/CMakeLists.txt b/lib/ecal_utils/CMakeLists.txt
@@ -17,6 +17,8 @@
 # ========================= eCAL LICENSE =================================
 project(ecal-utils)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 find_package(Threads REQUIRED)
 
 set (ecal_utils_includes

diff --git a/thirdparty/qwt/CMakeLists.txt b/thirdparty/qwt/CMakeLists.txt
@@ -7,6 +7,8 @@ endif()
 
 project(qwt VERSION 6.2.0)
 
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
 # Legacy Qt5 (pre 5.15) support as suggested by teh Qt Documentation:
 # https://doc.qt.io/qt-6/cmake-qt5-and-qt6-compatibility.html#supporting-older-qt-5-versions
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets OpenGL Svg Concurrent PrintSupport)