blob: d7bbce2f8cbe1cd7f9493e46cf2cce4d18ffd97c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
Index: gazebo-8.0.0/cmake/SearchForStuff.cmake
===================================================================
--- gazebo-8.0.0.orig/cmake/SearchForStuff.cmake
+++ gazebo-8.0.0/cmake/SearchForStuff.cmake
@@ -758,10 +758,10 @@ find_path(QWT_INCLUDE_DIR NAMES qwt.h PA
/usr/local/lib/qwt.framework/Headers
${QWT_WIN_INCLUDE_DIR}
- PATH_SUFFIXES qwt qwt5
+ PATH_SUFFIXES qwt6
)
-find_library(QWT_LIBRARY NAMES qwt-qt5 qwt PATHS
+find_library(QWT_LIBRARY NAMES qwt6-qt5 qwt PATHS
/usr/lib
/usr/local/lib
/usr/local/lib/qwt.framework
Index: gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
===================================================================
--- gazebo-8.0.0.orig/gazebo/gui/plot/qwt_gazebo.h
+++ gazebo-8.0.0/gazebo/gui/plot/qwt_gazebo.h
@@ -23,24 +23,24 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wfloat-equal"
-#include <qwt/qwt_curve_fitter.h>
-#include <qwt/qwt_legend.h>
-#include <qwt/qwt_painter.h>
-#include <qwt/qwt_picker_machine.h>
-#include <qwt/qwt_plot.h>
-#include <qwt/qwt_plot_canvas.h>
-#include <qwt/qwt_plot_curve.h>
-#include <qwt/qwt_plot_directpainter.h>
-#include <qwt/qwt_plot_grid.h>
-#include <qwt/qwt_plot_layout.h>
-#include <qwt/qwt_plot_magnifier.h>
-#include <qwt/qwt_plot_marker.h>
-#include <qwt/qwt_plot_panner.h>
-#include <qwt/qwt_plot_zoomer.h>
-#include <qwt/qwt_scale_engine.h>
-#include <qwt/qwt_scale_widget.h>
-#include <qwt/qwt_symbol.h>
-#include <qwt/qwt_plot_renderer.h>
+#include <qwt6/qwt_curve_fitter.h>
+#include <qwt6/qwt_legend.h>
+#include <qwt6/qwt_painter.h>
+#include <qwt6/qwt_picker_machine.h>
+#include <qwt6/qwt_plot.h>
+#include <qwt6/qwt_plot_canvas.h>
+#include <qwt6/qwt_plot_curve.h>
+#include <qwt6/qwt_plot_directpainter.h>
+#include <qwt6/qwt_plot_grid.h>
+#include <qwt6/qwt_plot_layout.h>
+#include <qwt6/qwt_plot_magnifier.h>
+#include <qwt6/qwt_plot_marker.h>
+#include <qwt6/qwt_plot_panner.h>
+#include <qwt6/qwt_plot_zoomer.h>
+#include <qwt6/qwt_scale_engine.h>
+#include <qwt6/qwt_scale_widget.h>
+#include <qwt6/qwt_symbol.h>
+#include <qwt6/qwt_plot_renderer.h>
#pragma clang diagnostic pop
|
GitWeb
