Commit 32800166 authored by Johannes Mey's avatar Johannes Mey
Browse files

move paho mqtt from submodule to dependency

parent fdf1ee64
[submodule "lib/paho.mqtt.c"]
path = lib/paho.mqtt.c
url = https://github.com/eclipse/paho.mqtt.c.git
[submodule "lib/paho.mqtt.cpp"]
path = lib/paho.mqtt.cpp
url = https://github.com/eclipse/paho.mqtt.cpp.git
......@@ -17,6 +17,7 @@ find_package(catkin REQUIRED COMPONENTS
message_generation
panda_grasping
panda_util
paho_mqtt
)
## System dependencies are found with CMake's conventions
......@@ -117,8 +118,6 @@ catkin_package(
${Protobuf_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
lib/paho.mqtt.c/src
lib/paho.mqtt.cpp/src
LIBRARIES
${PROJECT_NAME}_base
${PROJECT_NAME}_moveit
......@@ -129,13 +128,14 @@ catkin_package(
CATKIN_DEPENDS
message_runtime
moveit_ros_planning_interface
paho_mqtt
DEPENDS
)
###########
## Build ##
###########
message(${catkin_INCLUDE_DIRS})
## Specify additional locations of header files
## Your package locations should be listed before other locations
include_directories(
......@@ -144,26 +144,12 @@ include_directories(
${Protobuf_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
lib/paho.mqtt.c/src
lib/paho.mqtt.cpp/src
)
protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS proto/Scene.proto)
find_package(PkgConfig REQUIRED)
add_subdirectory(lib/paho.mqtt.c ${CATKIN_DEVEL_PREFIX})
# for clion (on maybe catkin-make) change the C library location to
# ${CATKIN_DEVEL_PREFIX}/lib/libpaho-mqtt3a.so
# set(PAHO_MQTT_C_LIBRARIES "${CATKIN_DEVEL_PREFIX}/src/libpaho-mqtt3a.so")
set(PAHO_MQTT_C_LIBRARIES "${CATKIN_DEVEL_PREFIX}/lib/libpaho-mqtt3a.so")
set(PAHO_MQTT_C_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/lib/paho.mqtt.c/src")
add_subdirectory(lib/paho.mqtt.cpp)
add_dependencies(paho-mqttpp3 paho-mqtt3a)
## Declare a C++ library
add_library(${PROJECT_NAME}_base ${PROTO_SRCS} ${PROTO_HDRS} src/controller/DummyRobotArmController.cpp src/controller/RobotArmController.cpp src/controller/Controller.cpp)
add_library(${PROJECT_NAME}_moveit ${PROTO_SRCS} ${PROTO_HDRS} src/controller/MoveItRobotArmController.cpp)
......@@ -203,7 +189,6 @@ target_link_libraries(${PROJECT_NAME}_ros
)
target_link_libraries(${PROJECT_NAME}_mqtt
${catkin_LIBRARIES}
paho-mqttpp3
)
target_link_libraries(${PROJECT_NAME}_base
${catkin_LIBRARIES}
......
......@@ -28,4 +28,4 @@ public:
~MqttConnection();
};
#endif // CCF_MQTTCONNECTION_H
\ No newline at end of file
#endif // CCF_MQTTCONNECTION_H
Subproject commit eff2da4875725509fc97641b118d6badf3e3a08f
Subproject commit 33921c8b68b351828650c36816e7ecf936764379
......@@ -33,6 +33,7 @@
<depend>moveit_ros_planning_interface</depend>
<build_depend>geometry_msgs</build_depend>
<depend>franka_gripper</depend>
<depend>paho_mqtt</depend>
<build_depend>tf2</build_depend>
<build_depend>protobuf</build_depend>
<build_depend>std_msgs</build_depend>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment