Fix catkin package dependencies, remove manual entries for target_lin…

…k_libraries
jubeira · Nov 23, 2016 · ac40cee · ac40cee
1 parent 137aceb
commit ac40cee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tango_ros_common/tango_ros_native/CMakeLists.txt b/tango_ros_common/tango_ros_native/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(JNI REQUIRED)
 find_package(OpenCV 2 REQUIRED)
 
 catkin_package(
-  CATKIN_DEPENDS roscpp sensor_msgs
+  CATKIN_DEPENDS roscpp sensor_msgs glog_catkin tango_client_api tango_support_api tf tf2_ros
   DEPENDS Eigen OpenCV
   )
 
@@ -39,8 +39,6 @@ target_link_libraries(tango_ros_native
   ${catkin_LIBRARIES}
   ${Eigen_LIBRARIES}
   ${OpenCV_LIBRARIES}
-  tango_client_api
-  tango_support_api
   )
 
 install(TARGETS tango_ros_native

diff --git a/third_party/tango_api/tango_client_api/CMakeLists.txt b/third_party/tango_api/tango_client_api/CMakeLists.txt
@@ -5,6 +5,7 @@ find_package(catkin REQUIRED)
 
 catkin_package(
   INCLUDE_DIRS include
+  LIBRARIES tango_client_api
   )
 
 include_directories(

diff --git a/third_party/tango_api/tango_support_api/CMakeLists.txt b/third_party/tango_api/tango_support_api/CMakeLists.txt
@@ -6,6 +6,8 @@ find_package(JNI REQUIRED)
 
 catkin_package(
   INCLUDE_DIRS include
+  CATKIN_DEPENDS tango_client_api
+  LIBRARIES tango_support_api
   )
 
 include_directories(
@@ -20,7 +22,6 @@ add_library(tango_support_api
 
 target_link_libraries(tango_support_api
   ${catkin_LIBRARIES}
-  tango_client_api
   )
 
 install(TARGETS tango_support_api