Skip to content

Commit

Permalink
Revert unwanted changes
Browse files Browse the repository at this point in the history
  • Loading branch information
RicardoM17 committed Jan 7, 2025
1 parent eff9dee commit 758561d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion COMPILE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down
24 changes: 12 additions & 12 deletions plotjuggler_plugins/DataStreamZMQ/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

0 comments on commit 758561d

Please sign in to comment.