Skip to content

Commit

Permalink
MQTT plugin removed
Browse files Browse the repository at this point in the history
  • Loading branch information
facontidavide committed Jun 13, 2021
1 parent c74f07b commit 838e3cb
Show file tree
Hide file tree
Showing 10 changed files with 2 additions and 810 deletions.
7 changes: 1 addition & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
[submodule "3rdparty/paho.mqtt.c"]
path = 3rdparty/paho.mqtt.c
url = https://github.com/eclipse/paho.mqtt.c.git
[submodule "3rdparty/liblsl"]
path = 3rdparty/liblsl
url = https://github.com/PlotJuggler/liblsl.git

1 change: 0 additions & 1 deletion 3rdparty/liblsl
Submodule liblsl deleted from 65ffb6
1 change: 0 additions & 1 deletion 3rdparty/paho.mqtt.c
Submodule paho.mqtt.c deleted from e4c375
43 changes: 0 additions & 43 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -197,51 +197,8 @@ endif()
add_subdirectory( 3rdparty/color_widgets )
add_subdirectory( 3rdparty/Qt-Advanced-Docking )
add_subdirectory( 3rdparty/qwt/src )

add_subdirectory( 3rdparty/lua-5.4.1 )

find_package(Git QUIET)
if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
# Update submodules as needed
option(GIT_SUBMODULE "Check submodules during build" ON)
if(GIT_SUBMODULE)
message(STATUS "Submodule update")
execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE GIT_SUBMOD_RESULT)
if(NOT GIT_SUBMOD_RESULT EQUAL "0")
message("git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
endif()
endif()
endif()

if(EXISTS "${PROJECT_SOURCE_DIR}/3rdparty/paho.mqtt.c/CMakeLists.txt")
SET(PAHO_ENABLE_TESTING FALSE CACHE BOOL "Build tests and run" FORCE)
SET(PAHO_ENABLE_CPACK FALSE CACHE BOOL "Enable CPack" FORCE)

if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
SET(PAHO_BUILD_STATIC FALSE CACHE BOOL "Build static library" FORCE)
SET(PAHO_BUILD_SHARED TRUE CACHE BOOL "Build shared library" FORCE)
else()
SET(PAHO_BUILD_STATIC TRUE CACHE BOOL "Build static library" FORCE)
SET(PAHO_BUILD_SHARED FALSE CACHE BOOL "Build shared library" FORCE)
endif()

SET(CMAKE_INSTALL_INCLUDEDIR )

#add_subdirectory( 3rdparty/paho.mqtt.c EXCLUDE_FROM_ALL)
#add_subdirectory( plotjuggler_plugins/DataStreamMQTT )
endif()

if(EXISTS "${PROJECT_SOURCE_DIR}/3rdparty/liblsl/CMakeLists.txt" AND NOT WIN32)
SET(LSL_ENABLE_TESTING FALSE CACHE BOOL "Build tests and run" FORCE)
SET(LSL_ENABLE_CPACK FALSE CACHE BOOL "Enable CPack" FORCE)
SET(LSL_BUILD_STATIC TRUE CACHE BOOL "Build static library" FORCE)
SET(LSL_BUILD_SHARED FALSE CACHE BOOL "Build shared library" FORCE)
#add_subdirectory( 3rdparty/liblsl )
#add_subdirectory( plotjuggler_plugins/DataStreamLSL )
endif()

add_subdirectory( plotjuggler_app )

add_subdirectory( plotjuggler_plugins/DataLoadCSV )
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Alternatively, you may download the Snaps version that include the ROS1 plugins:

Clone the repository as usual:

git clone --recurse-submodules https://github.com/facontidavide/PlotJuggler.git
git clone https://github.com/facontidavide/PlotJuggler.git

The only binary dependency that you need installed in your system is Qt5.
On Ubuntu, the debians can be installed with the the command:
Expand Down
31 changes: 0 additions & 31 deletions plotjuggler_plugins/DataStreamMQTT/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 838e3cb

Please sign in to comment.