Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for units, multipliers and instances #3

Merged
merged 3 commits into from
Apr 10, 2024
Merged

Added support for units, multipliers and instances #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
11ce26b
Fix cmake to correctly find newer plotjuggler releases
jwithelm Oct 4, 2021
345c15c
Added support for units, multipliers and instances
jwithelm Jul 13, 2022
a2e1d5f
Fix CMake
jwithelm Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions CMakeLists.txt
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ project(plotjuggler_apbin_plugins)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
)

#------- Include Qt dependencies -------
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
Expand All @@ -19,7 +14,7 @@ find_package(Qt5 REQUIRED COMPONENTS
Core
Widgets
Xml
Svg )
Svg)

include_directories(
${Qt5Core_INCLUDE_DIRS}
Expand Down Expand Up @@ -68,33 +63,32 @@ elseif( DEFINED ENV{AMENT_PREFIX_PATH})
#------------- Build without any ROS support ------------
else()

find_package(PlotJuggler REQUIRED)
find_package(plotjuggler REQUIRED)
message(STATUS "PlotJuggler FOUND")
message(STATUS "plotjuggler_INCLUDE_DIR: ${plotjuggler_INCLUDE_DIR}")
message(STATUS "plotjuggler_LIBRARIES: ${plotjuggler_LIBRARIES}")

include_directories(${PlotJuggler_INCLUDE_DIRS})
list(APPEND ${PJ_LIBRARIES} ${PlotJuggler_LIBRARIES} )
include_directories(${plotjuggler_INCLUDE_DIR})
list(APPEND PJ_LIBRARIES ${plotjuggler_LIBRARIES} )
set(PJ_PLUGIN_INSTALL_DIRECTORY bin )

endif()

#------- Create the libraries -------

add_library(DataAPBin SHARED
DataLoadAPBin/dataload_apbin.cpp
DataLoadAPBin/dataload_apbin.h
)
DataLoadAPBin/dataload_apbin.cpp )

target_link_libraries(DataAPBin
${PJ_LIBRARIES})

if (COMPILING_WITH_AMENT)
ament_target_dependencies(DataAPBin plotjuggler)
endif()
#------- Install the libraries -------

#------- Install the libraries -------
install(
TARGETS
DataAPBin
DESTINATION
${PJ_PLUGIN_INSTALL_DIRECTORY} )

Loading