From 758561de0b62e65eaadf0d8217f84958d5bc610d Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Tue, 7 Jan 2025 14:21:22 +0100 Subject: [PATCH] Revert unwanted changes --- COMPILE.md | 2 +- .../DataStreamZMQ/CMakeLists.txt | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/COMPILE.md b/COMPILE.md index 0ebfbbe5b..2d6dca5eb 100644 --- a/COMPILE.md +++ b/COMPILE.md @@ -120,7 +120,7 @@ export LDFLAGS="$QT_HOME/lib" Clone the repository into **~/plotjuggler_ws**: ```shell -git clone https://github.com/PX4/PlotJuggler.git ~/plotjuggler_ws/src/PlotJuggler +git clone https://github.com/facontidavide/PlotJuggler.git ~/plotjuggler_ws/src/PlotJuggler cd ~/plotjuggler_ws ``` diff --git a/plotjuggler_plugins/DataStreamZMQ/CMakeLists.txt b/plotjuggler_plugins/DataStreamZMQ/CMakeLists.txt index 0a2040d29..d7622ea98 100644 --- a/plotjuggler_plugins/DataStreamZMQ/CMakeLists.txt +++ b/plotjuggler_plugins/DataStreamZMQ/CMakeLists.txt @@ -10,24 +10,24 @@ endif() find_package(ZeroMQ QUIET) if(ZeroMQ_FOUND) - # message(STATUS "[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} ) + install(TARGETS DataStreamZMQ DESTINATION ${PJ_PLUGIN_INSTALL_DIRECTORY} ) else() message("[ZeroMQ] not found. Skipping plugin DataStreamZMQ.") endif()