fix name collisions

AustinDeric · AustinDeric · commit f2f2ce846728 · 2020-09-04T14:47:49.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -109,3 +109,14 @@ else()
 endif()
 
 target_include_directories(${PROJECT_NAME} PUBLIC include)
+
+# Install Targets
+install(TARGETS ${PROJECT_NAME}
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+)
+
+install(DIRECTORY include/${PROJECT_NAME}/
+  DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+)
diff --git a/include/optical_flow/constants.hpp b/include/optical_flow/constants.hpp
diff --git a/include/optical_flow/flow_opencv.hpp b/include/optical_flow/flow_opencv.hpp
@@ -44,7 +44,7 @@
 #include <opencv2/opencv.hpp>
 #include <cmath>
 
-#include "OpticalFlow/optical_flow.hpp"
+#include "optical_flow/optical_flow.hpp"
 #include "klt_feature_tracker/track_features.h"
 
 #define DEFAULT_NUMBER_OF_FEATURES 20
diff --git a/include/optical_flow/flow_px4.hpp b/include/optical_flow/flow_px4.hpp
@@ -40,10 +40,10 @@
 
 #pragma once
 
-#include "OpticalFlow/optical_flow.hpp"
-#include "OpticalFlow/px4flow.hpp"
+#include "optical_flow/optical_flow.hpp"
+#include "optical_flow/px4flow.hpp"
 #include <memory.h>
-#include "OpticalFlow/constants.hpp"
+#include "optical_flow/constants.hpp"
 
 class OpticalFlowPX4 : public OpticalFlow
 {
diff --git a/include/optical_flow/optical_flow.hpp b/include/optical_flow/optical_flow.hpp
@@ -43,7 +43,7 @@
 #include <stdint.h>
 #include <iostream>
 #include <cmath>
-#include "OpticalFlow/constants.hpp"
+#include "optical_flow/constants.hpp"
 
 class OpticalFlow
 {
diff --git a/include/optical_flow/px4flow.hpp b/include/optical_flow/px4flow.hpp
diff --git a/src/flow_opencv.cpp b/src/flow_opencv.cpp
@@ -38,7 +38,7 @@
 *      Author: Christoph
 */
 
-#include "OpticalFlow/flow_opencv.hpp"
+#include "optical_flow/flow_opencv.hpp"
 
 /****************************************************************************
  * OpenCV optical flow calculation
diff --git a/src/flow_px4.cpp b/src/flow_px4.cpp
@@ -41,7 +41,7 @@
 * PX4Flow flow calculation
 ****************************************************************************/
 
-#include "OpticalFlow/flow_px4.hpp"
+#include "optical_flow/flow_px4.hpp"
 #include <iostream>
 
 OpticalFlowPX4::OpticalFlowPX4(float f_length_x, float f_length_y, int ouput_rate, int img_width, int img_height,
diff --git a/src/optical_flow.cpp b/src/optical_flow.cpp
@@ -38,7 +38,7 @@
 *      Author: Christoph
 */
 
-#include "OpticalFlow/optical_flow.hpp"
+#include "optical_flow/optical_flow.hpp"
 
 void OpticalFlow::initLimitRate()
 {
diff --git a/src/px4flow.cpp b/src/px4flow.cpp
@@ -41,7 +41,7 @@
 #include <stdbool.h>
 #include <math.h>
 #include <iostream>
-#include "OpticalFlow/px4flow.hpp"
+#include "optical_flow/px4flow.hpp"
 
 PX4Flow::PX4Flow(uint32_t image_width_, uint32_t search_size_,
 		 uint32_t flow_feature_threshold_, uint32_t flow_value_threshold_,

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`#include <stdint.h>`
`44`	`44`	`#include <iostream>`
`45`	`45`	`#include <cmath>`
`46`		`-#include "OpticalFlow/constants.hpp"`
	`46`	`+#include "optical_flow/constants.hpp"`
`47`	`47`
`48`	`48`	`class OpticalFlow`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`* Author: Christoph`
`39`	`39`	`*/`
`40`	`40`
`41`		`-#include "OpticalFlow/optical_flow.hpp"`
	`41`	`+#include "optical_flow/optical_flow.hpp"`
`42`	`42`
`43`	`43`	`void OpticalFlow::initLimitRate()`
`44`	`44`	`{`