From b2d557c52de7f241f7dadfe745c27b2eb7317fc2 Mon Sep 17 00:00:00 2001 From: Junya Hayashi <junya.hayashi@groove-x.com> Date: Sun, 4 Dec 2016 22:55:31 +0900 Subject: [PATCH] Fix CMakeLists.txt and package.xml --- CMakeLists.txt | 35 ++++++++--------------------------- package.xml | 4 ++-- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6494d07..0cf209d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,39 +1,20 @@ cmake_minimum_required(VERSION 2.8.3) project(mqtt_bridge) -find_package(catkin REQUIRED COMPONENTS - rospy - rosbridge_library -) - +find_package(catkin REQUIRED) catkin_python_setup() +catkin_package() -catkin_package( -) - -########### -## Build ## -########### - -include_directories( - ${catkin_INCLUDE_DIRS} -) - -############# -## Install ## -############# install(PROGRAMS - scripts/mqtt_bridge_node.py.py + scripts/mqtt_bridge_node.py DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} ) -install(DIRECTORY launch config - DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS +install(DIRECTORY launch + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch ) -############# -## Testing ## -############# - -# catkin_add_nosetests(test) +install(DIRECTORY config + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/config +) diff --git a/package.xml b/package.xml index 1a1d5ca..d5df5a5 100644 --- a/package.xml +++ b/package.xml @@ -12,8 +12,8 @@ <url type="website">https://bitbucket.org/groove-x/mqtt_bridge</url> <buildtool_depend>catkin</buildtool_depend> - <depend>rospy</depend> - <depend>rosbridge_library</depend> + <exec_depend>rospy</exec_depend> + <exec_depend>rosbridge_library</exec_depend> <exec_depend>std_msgs</exec_depend> <export> -- GitLab