Skip to content

Commit 0623952

Browse files
author
alireza@general
committed
feat: removed all darknet_ros dependencies
1 parent e6145cf commit 0623952

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

src/dji_osdk_ros/modules/CMakeLists.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,19 @@ elseif()
7777
message(STATUS "Did not find CUDA in the system")
7878
endif()
7979

80-
find_package(darknet_ros QUIET)
81-
if(darknet_ros_FOUND)
82-
message(STATUS "Found darknet_ros package, will use it for object depth perception sample.")
83-
add_definitions(-DUSE_DARKNET_ROS)
84-
set(ENABLE_DARKNET_ROS 1 CACHE INTERNAL "ENABLE_DARKNET_ROS")
85-
endif()
86-
87-
#if (OPEN_CV_3_3_0_INSTALLED AND FOUND_OPENCV_VIZ)
88-
# FILE(GLOB SOURCES *.cc *.cpp *.c *.cxx stereo_utility/*cpp)
89-
# include_directories(../../../include/dji_osdk_ros/stereo_utility)
90-
# else()
91-
# FILE(GLOB SOURCES *.cc *.cpp *.c *.cxx)
80+
#find_package(darknet_ros QUIET)
81+
#if(darknet_ros_FOUND)
82+
# message(STATUS "Found darknet_ros package, will use it for object depth perception sample.")
83+
# add_definitions(-DUSE_DARKNET_ROS)
84+
# set(ENABLE_DARKNET_ROS 1 CACHE INTERNAL "ENABLE_DARKNET_ROS")
9285
#endif()
86+
87+
if (OPEN_CV_3_3_0_INSTALLED AND FOUND_OPENCV_VIZ)
88+
FILE(GLOB SOURCES *.cc *.cpp *.c *.cxx stereo_utility/*cpp)
89+
include_directories(../../../include/dji_osdk_ros/stereo_utility)
90+
else()
91+
FILE(GLOB SOURCES *.cc *.cpp *.c *.cxx)
92+
endif()
9393
FILE(GLOB SOURCES *.cc *.cpp *.c *.cxx stereo_utility/*cpp)
9494
include_directories(../../../include/dji_osdk_ros/stereo_utility)
9595

src/dji_osdk_ros/samples/CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ if(ENABLE_GPU)
1414
add_definitions(-DUSE_GPU)
1515
endif()
1616

17-
if(ENABLE_DARKNET_ROS)
18-
add_definitions(-DUSE_DARKNET_ROS)
19-
endif()
17+
#if(ENABLE_DARKNET_ROS)
18+
#add_definitions(-DUSE_DARKNET_ROS)
19+
#endif()
2020

2121
add_executable(flight_control_node
2222
flight_control_node.cpp)
@@ -90,28 +90,28 @@ target_link_libraries(waypointV2_node
9090
)
9191
add_dependencies(waypointV2_node dji_osdk_ros_generate_messages_cpp)
9292

93-
#if (OPEN_CV_3_3_0_INSTALLED AND FOUND_OPENCV_VIZ)
93+
if (OPEN_CV_3_3_0_INSTALLED AND FOUND_OPENCV_VIZ)
9494

9595
message(STATUS "Found OpenCV ${OpenCV_VERSION}, Viz3d, and advanced sensing module, stereo vision depth perception node will be compiled")
9696
add_definitions(-DOPEN_CV_INSTALLED)
9797
add_executable(stereo_vision_depth_perception_node
9898
stereo_vision_depth_perception_node.cpp)
9999
target_include_directories(${PROJECT_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS})
100100

101-
# if (OPEN_CV_3_3_0_INSTALLED)
101+
if (OPEN_CV_3_3_0_INSTALLED)
102102
target_link_libraries(stereo_vision_depth_perception_node
103103
${catkin_LIBRARIES}
104104
${PROJECT_NAME}
105105
${OpenCV_LIBRARIES}
106106
)
107-
# else()
107+
else()
108108
target_link_libraries(stereo_vision_depth_perception_node
109109
${catkin_LIBRARIES}
110110
${PROJECT_NAME}
111111
)
112-
# endif()
112+
endif()
113113
add_dependencies(stereo_vision_depth_perception_node dji_osdk_ros_generate_messages_cpp)
114-
#else()
115-
# message(STATUS "Did not find required libraries, stereo vision depth perception node will not be compiled.")
116-
#endif ()
114+
else()
115+
message(STATUS "Did not find required libraries, stereo vision depth perception node will not be compiled.")
116+
endif ()
117117

src/dji_osdk_ros_obsoleted/modules/dji_sdk_node_publisher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <sensor_msgs/Joy.h>
1515
#include <dji_telemetry.hpp>
1616

17-
#include <opencv/opencv2/opencv.hpp>
17+
#include <opencv2/opencv.hpp>
1818
#include <cv_bridge/cv_bridge.h>
1919

2020

0 commit comments

Comments
 (0)