Merge pull request #77 from UbiquityRobotics/origin/issue-#76

Fix deps
UbiquityRobotics · May 21, 2017 · 78619e2 · 78619e2 · jim-v · May 21, 2017
2 parents 6ef88f7 + 1187266
commit 78619e2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/aruco_detect/CMakeLists.txt b/aruco_detect/CMakeLists.txt
@@ -34,7 +34,8 @@ add_executable(aruco_detect src/aruco_detect.cpp)
 add_executable(test_board src/test_board.cpp)
 add_executable(create_marker src/create_marker.cpp)
 
-add_dependencies(aruco_detect ${PROJECT_NAME}_gencfg)
+add_dependencies(aruco_detect ${${PROJECT_NAME}_EXPORTED_TARGETS}
+                 ${catkin_EXPORTED_TARGETS})
 
 target_link_libraries(aruco_detect ${catkin_LIBRARIES} ${OpenCV_LIBS})
 target_link_libraries(test_board ${catkin_LIBRARIES} ${OpenCV_LIBS})

diff --git a/fiducial_detect/CMakeLists.txt b/fiducial_detect/CMakeLists.txt
@@ -16,21 +16,24 @@ find_package(catkin REQUIRED COMPONENTS
   sensor_msgs
   std_msgs
 )
-find_package(orocos_kdl REQUIRED)
+
+find_package(OpenCV REQUIRED)
 
 catkin_package()
 
+
 ###########
 ## Build ##
 ###########
 
-include_directories(${catkin_INCLUDE_DIRS})
-
-link_directories(${orocos_kdl_LIBRARY_DIRS})
+include_directories(${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
 
 add_executable(fiducial_detect src/fiducial_detect.cpp)
 target_link_libraries(fiducial_detect ${catkin_LIBRARIES}
-${orocos_kdl_LIBRARIES})
+                      ${OpenCV_INCLUDE_LIBS})
+add_dependencies(fiducial_detect ${${PROJECT_NAME}_EXPORTED_TARGETS}
+                 ${catkin_EXPORTED_TARGETS})
+
 
 #############
 ## Install ##

diff --git a/fiducial_pose/CMakeLists.txt b/fiducial_pose/CMakeLists.txt
@@ -23,11 +23,9 @@ include_directories(include ${OpenCV_INCLUDE_DIRS})
 include_directories(${catkin_INCLUDE_DIRS})
 
 
-
 add_library(rpp_pose src/Rpoly.cpp src/RPP.cpp src/calcPose.cpp)
-target_link_libraries(rpp_pose m ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
-
-#add_dependencies(rpp_pose fiducial_pose_gencpp fiducial_pose_gencpp)
+add_dependencies(rpp_pose ${${PROJECT_NAME}_EXPORTED_TARGETS}
+                 ${catkin_EXPORTED_TARGETS})
 
 install(TARGETS rpp_pose
    ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}

diff --git a/fiducial_slam/CMakeLists.txt b/fiducial_slam/CMakeLists.txt
@@ -30,7 +30,8 @@ include_directories(${catkin_INCLUDE_DIRS} include)
 include_directories(${OpenCV_INCLUDE_DIRS})
 
 add_executable(fiducial_slam src/fiducial_slam.cpp src/map.cpp)
-add_dependencies(fiducial_slam ${catkin_EXPORTED_TARGETS})
+add_dependencies(fiducial_slam ${${PROJECT_NAME}_EXPORTED_TARGETS}
+                 ${catkin_EXPORTED_TARGETS})
 
 target_link_libraries(fiducial_slam ${catkin_LIBRARIES} ${OpenCV_LIBS})