Merge pull request #2 from Maidbot/bugfix/proper-catkin-package

[Bugfix] Make proper catkin package for use by external packages

Author: AustinDeric

.gitmodules

@@ -40,6 +40,20 @@ if( POLICY CMP0042 )
   cmake_policy(SET CMP0042 NEW)
 endif()
 project( OpticalFlow )
+
+find_package(catkin REQUIRED COMPONENTS
+  klt_feature_tracker)
+
+catkin_package(
+  INCLUDE_DIRS include
+  CATKIN_DEPENDS klt_feature_tracker
+)
+
+include_directories(
+  include
+  ${catkin_INCLUDE_DIRS}
+)
+
 set(version_major 0)
 set(version_minor 1)
 set(version_patch 0)
@@ -55,15 +69,11 @@ set(${PROJECT_NAME}_INCLUDE_DIRS
 find_package( OpenCV REQUIRED )
 OPTION(OPENCV "ON for OpenCV" ON) # -DOPENCV=OFF
 
-add_subdirectory( external/klt_feature_tracker klt_feature_tracker )
-set( klt_feature_tracker_LIBS "klt_feature_tracker" )
-
 if(OpenCV_FOUND AND OPENCV)
     message(STATUS "Building ${PROJECT_NAME} with OpenCV")
 
     set(OpticalFlow_INCLUDE_DIRS
-      ${CMAKE_CURRENT_SOURCE_DIR}/include
-      ${klt_feature_tracker_INCLUDE_DIRS}
+      ${catkin_INCLUDE_DIRS}
       ${OpenCV_INCLUDE_DIRS}
     )
 
@@ -78,7 +88,7 @@ if(OpenCV_FOUND AND OPENCV)
 
     target_link_libraries( OpticalFlow
       ${OpenCV_LIBS}
-      ${klt_feature_tracker_LIBS}
+      ${catkin_LIBRARIES}
     )
 else()
     message(STATUS "Building ${PROJECT_NAME} without OpenCV")
@@ -98,24 +108,3 @@ else()
 endif()
 
 target_include_directories(OpticalFlow PUBLIC include)
-
-# Generate the Config file from the .in file, doing @VAR@ substitution only
-configure_file(OpticalFlowConfig.cmake.in FindOpticalFlow.cmake @ONLY)
-
-# INSTALL STEPS
-INSTALL(
-  TARGETS OpticalFlow
-  RUNTIME DESTINATION lib
-  LIBRARY DESTINATION lib)
-
-INSTALL(
-  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/external/klt_feature_tracker/include/
-  DESTINATION include)
-
-INSTALL(
-  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/
-  DESTINATION include)
-
-INSTALL(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/FindOpticalFlow.cmake
-  DESTINATION ${CMAKE_INSTALL_PREFIX})

CMakeLists.txt

@@ -44,8 +44,8 @@
 #include <opencv2/opencv.hpp>
 #include <cmath>
 
-#include "optical_flow.hpp"
-#include "trackFeatures.h"
+#include "OpticalFlow/optical_flow.hpp"
+#include "klt_feature_tracker/trackFeatures.h"
 
 #define DEFAULT_NUMBER_OF_FEATURES 20
 #define DEFAULT_CONFIDENCE_MULTIPLIER 1.645f //90% confidence interval

OpticalFlowConfig.cmake.in

@@ -40,10 +40,10 @@
 
 #pragma once
 
-#include "optical_flow.hpp"
-#include "px4flow.hpp"
+#include "OpticalFlow/optical_flow.hpp"
+#include "OpticalFlow/px4flow.hpp"
 #include <memory.h>
-#include "constants.hpp"
+#include "OpticalFlow/constants.hpp"
 
 class OpticalFlowPX4 : public OpticalFlow
 {

external/klt_feature_tracker

@@ -43,7 +43,7 @@
 #include <stdint.h>
 #include <iostream>
 #include <cmath>
-#include "constants.hpp"
+#include "OpticalFlow/constants.hpp"
 
 class OpticalFlow
 {

include/constants.hpp renamed to include/OpticalFlow/constants.hpp

@@ -31,57 +31,21 @@
  - POSSIBILITY OF SUCH DAMAGE.
  -
 -->
-<package>
+<package format="2">
   <name>OpticalFlow</name>
   <version>0.0.0</version>
   <description>Optical flow package</description>
 
-  <!-- One maintainer tag required, multiple allowed, one person per tag -->
-  <!-- Example:  -->
-  <!-- <maintainer email="[email protected]">Jane Doe</maintainer> -->
   <maintainer email="[email protected]">christoph</maintainer>
 
-
-  <!-- One license tag required, multiple allowed, one license per tag -->
-  <!-- Commonly used license strings: -->
-  <!--   BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
   <license>BSD</license>
 
+  <buildtool_depend>catkin</buildtool_depend>
 
-  <!-- Url tags are optional, but mutiple are allowed, one per tag -->
-  <!-- Optional attribute type can be: website, bugtracker, or repository -->
-  <!-- Example: -->
-  <!-- <url type="website">http://wiki.ros.org/snap_cam_publisher</url> -->
-
-
-  <!-- Author tags are optional, mutiple are allowed, one per tag -->
-  <!-- Authors do not have to be maintianers, but could be -->
-  <!-- Example: -->
-  <!-- <author email="[email protected]">Jane Doe</author> -->
-
-
-  <!-- The *_depend tags are used to specify dependencies -->
-  <!-- Dependencies can be catkin packages or system dependencies -->
-  <!-- Examples: -->
-  <!-- Use build_depend for packages you need at compile time: -->
-  <!--   <build_depend>message_generation</build_depend> -->
-  <!-- Use buildtool_depend for build tool packages: -->
-  <!--   <buildtool_depend>catkin</buildtool_depend> -->
-  <!-- Use run_depend for packages you need at runtime: -->
-  <!--   <run_depend>message_runtime</run_depend> -->
-  <!-- Use test_depend for packages you need only for testing: -->
-  <!--   <test_depend>gtest</test_depend> -->
-
-  <build_depend>libopencv-dev</build_depend>
-  <run_depend>libopencv-dev</run_depend>
-
-  <build_depend>klt_feature_tracker</build_depend>
-  <run_depend>klt_feature_tracker</run_depend>
-
+  <depend>libopencv-dev</depend>
+  <depend>klt_feature_tracker</depend>
 
-  <!-- The export tag contains other, unspecified, tags -->
   <export>
-    <!-- Other tools can request additional information be placed here -->
 
   </export>
 </package>