Merge pull request #20 from k-okada/drop_hydro

drop hydro and add lunar
jsk-ros-pkg · Nov 8, 2017 · e012288 · e012288
2 parents f2939ce + f4db2a1
commit e012288
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis b/.travis
diff --git a/.travis.yml b/.travis.yml
@@ -11,10 +11,10 @@ env:
   global:
     - USE_TRAVIS=true
   matrix:
-    - ROS_DISTRO=hydro   USE_DEB=true USE_DOCKER=true
     - ROS_DISTRO=indigo  USE_DEB=true
     - ROS_DISTRO=jade    USE_DEB=true
     - ROS_DISTRO=kinetic USE_DEB=true USE_DOCKER=true
+    - ROS_DISTRO=lunar   USE_DEB=true USE_DOCKER=true
 script: source .travis/travis.sh
 notifications:
   email:

diff --git a/posedetection_msgs/CMakeLists.txt b/posedetection_msgs/CMakeLists.txt
@@ -36,6 +36,7 @@ catkin_package(
     LIBRARIES # TODO
 )
 
+find_package(OpenCV)
 add_executable(feature0d_view src/feature0d_view.cpp)
 target_link_libraries(feature0d_view ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
 add_dependencies(feature0d_view posedetection_msgs_gencpp)