Building fine on MacOS 14.6

PX4 · Sep 15, 2024 · 591cb1d · 591cb1d
1 parent 2c51aa6
commit 591cb1d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/plotjuggler_plugins/DataStreamZMQ/CMakeLists.txt b/plotjuggler_plugins/DataStreamZMQ/CMakeLists.txt
@@ -9,25 +9,25 @@ endif()
 
 find_package(ZeroMQ QUIET)
 
-if(ZeroMQ_FOUND)
-    message(STATUS "[ZeroMQ] found")
+# if(ZeroMQ_FOUND)
+#     message(STATUS "[ZeroMQ] found")
 
-    add_definitions(${QT_DEFINITIONS})
-    add_definitions(-DQT_PLUGIN)
+#     add_definitions(${QT_DEFINITIONS})
+#     add_definitions(-DQT_PLUGIN)
 
-    QT5_WRAP_UI ( UI_SRC  datastream_zmq.ui  )
+#     QT5_WRAP_UI ( UI_SRC  datastream_zmq.ui  )
 
-    add_library(DataStreamZMQ SHARED datastream_zmq.cpp ${UI_SRC}  )
+#     add_library(DataStreamZMQ SHARED datastream_zmq.cpp ${UI_SRC}  )
 
-    target_link_libraries(DataStreamZMQ ${Qt5Widgets_LIBRARIES} plotjuggler_base)
+#     target_link_libraries(DataStreamZMQ ${Qt5Widgets_LIBRARIES} plotjuggler_base)
 
-    if(BUILDING_WITH_VCPKG OR BUILDING_WITH_CONAN)
-        target_link_libraries(DataStreamZMQ libzmq-static)
-    else()
-        target_link_libraries(DataStreamZMQ ${ZeroMQ_LIBRARIES})
-    endif()
+#     if(BUILDING_WITH_VCPKG OR BUILDING_WITH_CONAN)
+#         target_link_libraries(DataStreamZMQ libzmq-static)
+#     else()
+#         target_link_libraries(DataStreamZMQ ${ZeroMQ_LIBRARIES})
+#     endif()
 
-    install(TARGETS DataStreamZMQ DESTINATION ${PJ_PLUGIN_INSTALL_DIRECTORY}  )
-else()
-    message("[ZeroMQ] not found. Skipping plugin DataStreamZMQ.")
-endif()
+#     install(TARGETS DataStreamZMQ DESTINATION ${PJ_PLUGIN_INSTALL_DIRECTORY}  )
+# else()
+#     message("[ZeroMQ] not found. Skipping plugin DataStreamZMQ.")
+# endif()
diff --git a/plotjuggler_plugins/ParserProtobuf/error_collectors.h b/plotjuggler_plugins/ParserProtobuf/error_collectors.h
@@ -10,10 +10,10 @@ class IoErrorCollector : public google::protobuf::io::ErrorCollector
 {
 public:
   void AddError(int line, google::protobuf::io::ColumnNumber column,
-                const std::string& message) override;
+                const std::string& message);
 
   void AddWarning(int line, google::protobuf::io::ColumnNumber column,
-                  const std::string& message) override;
+                  const std::string& message);
 
   const QStringList& errors()
   {
@@ -28,10 +28,10 @@ class FileErrorCollector : public google::protobuf::compiler::MultiFileErrorColl
 {
 public:
   void AddError(const std::string& filename, int line, int,
-                const std::string& message) override;
+                const std::string& message);
 
   void AddWarning(const std::string& filename, int line, int,
-                  const std::string& message) override;
+                  const std::string& message);
 
   const QStringList& errors()
   {