Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-01 12:57:27 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

[nps] only search/link OpenCV if NPS_DEBUG_VIDEO is configured

Browse Source
This commit is contained in:
Felix Ruess
2017-12-29 14:08:45 +01:00
parent 6e391679ca
commit 27124fe32f
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/fdm_gazebo.xml
+10 -6
View File
@@ -104,19 +104,23 @@
<flight_plan> <flight_plan>
@endcode @endcode
</description> </description>
<configure name="NPS_DEBUG_VIDEO" value="0|1" description="show window with video for debugging"/>
</doc> </doc>
<header/> <header/>
<makefile target="nps"> <makefile target="nps">
<raw> <raw>
nps.CXXFLAGS += $(shell pkg-config gazebo --cflags opencv) nps.CXXFLAGS += $(shell pkg-config gazebo --cflags)
nps.LDFLAGS += $(shell pkg-config gazebo --libs) nps.LDFLAGS += $(shell pkg-config gazebo --libs)
<!-- OpenCV for video debugging -->
NPS_DEBUG_VIDEO ?= 0
ifeq (,$(findstring $(NPS_DEBUG_VIDEO),0 FALSE))
nps.CXXFLAGS += -DNPS_DEBUG_VIDEO
nps.CXXFLAGS += $(shell pkg-config opencv)
nps.LDFLAGS += -lopencv_imgproc -lopencv_highgui -lopencv_core
endif
</raw> </raw>
<file name="nps_fdm_gazebo.cpp" dir="nps"/> <file name="nps_fdm_gazebo.cpp" dir="nps"/>
<!--OPENCV-->
<flag name="LDFLAGS" value="lopencv_imgproc" />
<flag name="LDFLAGS" value="lopencv_highgui" />
<flag name="LDFLAGS" value="lopencv_core" />
</makefile> </makefile>
</module> </module>
sw/simulator/nps/nps_fdm_gazebo.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ extern "C" {
#include "subsystems/actuators/motor_mixing_types.h" #include "subsystems/actuators/motor_mixing_types.h"
} }
#if defined(NPS_DEBUG_VIDEO) || defined(NPS_DEBUG_STEREOCAM) #if defined(NPS_DEBUG_VIDEO)
// Opencv tools // Opencv tools
#include <opencv2/core/core.hpp> #include <opencv2/core/core.hpp>
#include <opencv2/highgui/highgui.hpp> #include <opencv2/highgui/highgui.hpp>