apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #135. Fixed opencv include dir order.

Browse Source
This commit is contained in:
matlabbe 2022-12-10 16:06:35 -08:00
parent 75342649fa
commit b0b5d24c76
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -393,6 +393,7 @@ ELSE()
## DEPENDS: system dependencies of this project that dependent projects also need ## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package( catkin_package(
CATKIN_DEPENDS cv_bridge roscpp rospy sensor_msgs std_msgs image_transport message_filters tf message_runtime CATKIN_DEPENDS cv_bridge roscpp rospy sensor_msgs std_msgs image_transport message_filters tf message_runtime
DEPENDS OpenCV
) )
########### ###########

10
src/CMakeLists.txt
View File

@ -96,12 +96,6 @@ SET(INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR} # for qt ui generated in binary dir ${CMAKE_CURRENT_BINARY_DIR} # for qt ui generated in binary dir
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
) )
IF(CATKIN_BUILD)
SET(INCLUDE_DIRS
${INCLUDE_DIRS}
${catkin_INCLUDE_DIRS}
)
ENDIF(CATKIN_BUILD)
IF(QT4_FOUND) IF(QT4_FOUND)
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
@ -140,6 +134,10 @@ ENDIF(TORCH_FOUND)
#include files #include files
INCLUDE_DIRECTORIES(${INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${INCLUDE_DIRS})
IF(CATKIN_BUILD)
INCLUDE_DIRECTORIES(SYSTEM ${catkin_INCLUDE_DIRS})
ENDIF(CATKIN_BUILD)
# create a library from the source files # create a library from the source files
ADD_LIBRARY(find_object ${SRC_FILES}) ADD_LIBRARY(find_object ${SRC_FILES})
# Linking with Qt libraries # Linking with Qt libraries

2
src/ros/find_object_2d_node.cpp
View File

@ -179,7 +179,7 @@ int main(int argc, char** argv)
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
// connect stuff: // connect stuff:
QObject::connect(camera, SIGNAL(imageReceived(const cv::Mat &, const find_object::Header &, const cv::Mat &, float)), findObjectROS, SLOT(detect(const cv::Mat &, const QString &, double, const cv::Mat &, float))); QObject::connect(camera, SIGNAL(imageReceived(const cv::Mat &, const find_object::Header &, const cv::Mat &, float)), findObjectROS, SLOT(detect(const cv::Mat &, const find_object::Header &, const cv::Mat &, float)));
//loop //loop
camera->start(); camera->start();