Skip to content

Commit bce15cc

Browse files
Fix runtime errors with optical flow (#3)
* add catkin_pacakge libraries * Rename package to optical_flow
1 parent 5d64d24 commit bce15cc

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,15 @@ endif()
3939
if( POLICY CMP0042 )
4040
cmake_policy(SET CMP0042 NEW)
4141
endif()
42-
project( OpticalFlow )
42+
project( optical_flow )
4343

4444
find_package(catkin REQUIRED COMPONENTS
4545
klt_feature_tracker)
4646

4747
catkin_package(
4848
INCLUDE_DIRS include
4949
CATKIN_DEPENDS klt_feature_tracker
50+
LIBRARIES ${PROJECT_NAME}
5051
)
5152

5253
include_directories(
@@ -72,39 +73,39 @@ OPTION(OPENCV "ON for OpenCV" ON) # -DOPENCV=OFF
7273
if(OpenCV_FOUND AND OPENCV)
7374
message(STATUS "Building ${PROJECT_NAME} with OpenCV")
7475

75-
set(OpticalFlow_INCLUDE_DIRS
76+
set(${PROJECT_NAME}_INCLUDE_DIRS
7677
${catkin_INCLUDE_DIRS}
7778
${OpenCV_INCLUDE_DIRS}
7879
)
7980

80-
include_directories(OpticalFlow_INCLUDE_DIRS)
81+
include_directories(${PROJECT_NAME}_INCLUDE_DIRS)
8182

82-
add_library( OpticalFlow SHARED
83+
add_library( ${PROJECT_NAME} SHARED
8384
src/optical_flow.cpp
8485
src/px4flow.cpp
8586
src/flow_px4.cpp
8687
src/flow_opencv.cpp
8788
)
8889

89-
target_link_libraries( OpticalFlow
90+
target_link_libraries( ${PROJECT_NAME}
9091
${OpenCV_LIBS}
9192
${catkin_LIBRARIES}
9293
)
9394
else()
9495
message(STATUS "Building ${PROJECT_NAME} without OpenCV")
9596

96-
set(OpticalFlow_INCLUDE_DIRS
97+
set(${PROJECT_NAME}_INCLUDE_DIRS
9798
${CMAKE_CURRENT_SOURCE_DIR}/include
9899
)
99100

100-
include_directories(OpticalFlow_INCLUDE_DIRS)
101+
include_directories(${PROJECT_NAME}_INCLUDE_DIRS)
101102

102-
add_library( OpticalFlow SHARED
103+
add_library( ${PROJECT_NAME} SHARED
103104
src/optical_flow.cpp
104105
src/px4flow.cpp
105106
src/flow_px4.cpp
106107
)
107108

108109
endif()
109110

110-
target_include_directories(OpticalFlow PUBLIC include)
111+
target_include_directories(${PROJECT_NAME} PUBLIC include)

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
-
3333
-->
3434
<package format="2">
35-
<name>OpticalFlow</name>
35+
<name>optical_flow</name>
3636
<version>0.0.0</version>
3737
<description>Optical flow package</description>
3838

0 commit comments

Comments
 (0)