move qwtpolar

qgis · Jan 22, 2018 · 1042754 · 1042754
1 parent 204eaf8
commit 1042754
Show file tree

Hide file tree

Showing 31 changed files with 21 additions and 21 deletions.
diff --git a/src/app/gps/qwtpolar-1.1.1/qwt_polar.h → external/qwtpolar-1.1.1/qwt_polar.h b/src/app/gps/qwtpolar-1.1.1/qwt_polar.h → external/qwtpolar-1.1.1/qwt_polar.h
diff --git a/...p/gps/qwtpolar-1.1.1/qwt_polar_canvas.cpp → external/qwtpolar-1.1.1/qwt_polar_canvas.cpp b/...p/gps/qwtpolar-1.1.1/qwt_polar_canvas.cpp → external/qwtpolar-1.1.1/qwt_polar_canvas.cpp
diff --git a/...app/gps/qwtpolar-1.1.1/qwt_polar_canvas.h → external/qwtpolar-1.1.1/qwt_polar_canvas.h b/...app/gps/qwtpolar-1.1.1/qwt_polar_canvas.h → external/qwtpolar-1.1.1/qwt_polar_canvas.h
diff --git a/...pp/gps/qwtpolar-1.1.1/qwt_polar_curve.cpp → external/qwtpolar-1.1.1/qwt_polar_curve.cpp b/...pp/gps/qwtpolar-1.1.1/qwt_polar_curve.cpp → external/qwtpolar-1.1.1/qwt_polar_curve.cpp
diff --git a/src/app/gps/qwtpolar-1.1.1/qwt_polar_curve.h → external/qwtpolar-1.1.1/qwt_polar_curve.h b/src/app/gps/qwtpolar-1.1.1/qwt_polar_curve.h → external/qwtpolar-1.1.1/qwt_polar_curve.h
diff --git a/...p/gps/qwtpolar-1.1.1/qwt_polar_fitter.cpp → external/qwtpolar-1.1.1/qwt_polar_fitter.cpp b/...p/gps/qwtpolar-1.1.1/qwt_polar_fitter.cpp → external/qwtpolar-1.1.1/qwt_polar_fitter.cpp
diff --git a/...app/gps/qwtpolar-1.1.1/qwt_polar_fitter.h → external/qwtpolar-1.1.1/qwt_polar_fitter.h b/...app/gps/qwtpolar-1.1.1/qwt_polar_fitter.h → external/qwtpolar-1.1.1/qwt_polar_fitter.h
diff --git a/...app/gps/qwtpolar-1.1.1/qwt_polar_global.h → external/qwtpolar-1.1.1/qwt_polar_global.h b/...app/gps/qwtpolar-1.1.1/qwt_polar_global.h → external/qwtpolar-1.1.1/qwt_polar_global.h
diff --git a/...app/gps/qwtpolar-1.1.1/qwt_polar_grid.cpp → external/qwtpolar-1.1.1/qwt_polar_grid.cpp b/...app/gps/qwtpolar-1.1.1/qwt_polar_grid.cpp → external/qwtpolar-1.1.1/qwt_polar_grid.cpp
diff --git a/src/app/gps/qwtpolar-1.1.1/qwt_polar_grid.h → external/qwtpolar-1.1.1/qwt_polar_grid.h b/src/app/gps/qwtpolar-1.1.1/qwt_polar_grid.h → external/qwtpolar-1.1.1/qwt_polar_grid.h
diff --git a/...app/gps/qwtpolar-1.1.1/qwt_polar_item.cpp → external/qwtpolar-1.1.1/qwt_polar_item.cpp b/...app/gps/qwtpolar-1.1.1/qwt_polar_item.cpp → external/qwtpolar-1.1.1/qwt_polar_item.cpp
diff --git a/src/app/gps/qwtpolar-1.1.1/qwt_polar_item.h → external/qwtpolar-1.1.1/qwt_polar_item.h b/src/app/gps/qwtpolar-1.1.1/qwt_polar_item.h → external/qwtpolar-1.1.1/qwt_polar_item.h
diff --git a/...gps/qwtpolar-1.1.1/qwt_polar_itemdict.cpp → ...nal/qwtpolar-1.1.1/qwt_polar_itemdict.cpp b/...gps/qwtpolar-1.1.1/qwt_polar_itemdict.cpp → ...nal/qwtpolar-1.1.1/qwt_polar_itemdict.cpp
diff --git a/...p/gps/qwtpolar-1.1.1/qwt_polar_itemdict.h → external/qwtpolar-1.1.1/qwt_polar_itemdict.h b/...p/gps/qwtpolar-1.1.1/qwt_polar_itemdict.h → external/qwtpolar-1.1.1/qwt_polar_itemdict.h
diff --git a/...p/gps/qwtpolar-1.1.1/qwt_polar_layout.cpp → external/qwtpolar-1.1.1/qwt_polar_layout.cpp b/...p/gps/qwtpolar-1.1.1/qwt_polar_layout.cpp → external/qwtpolar-1.1.1/qwt_polar_layout.cpp
diff --git a/...app/gps/qwtpolar-1.1.1/qwt_polar_layout.h → external/qwtpolar-1.1.1/qwt_polar_layout.h b/...app/gps/qwtpolar-1.1.1/qwt_polar_layout.h → external/qwtpolar-1.1.1/qwt_polar_layout.h
diff --git a/...ps/qwtpolar-1.1.1/qwt_polar_magnifier.cpp → ...al/qwtpolar-1.1.1/qwt_polar_magnifier.cpp b/...ps/qwtpolar-1.1.1/qwt_polar_magnifier.cpp → ...al/qwtpolar-1.1.1/qwt_polar_magnifier.cpp
diff --git a/.../gps/qwtpolar-1.1.1/qwt_polar_magnifier.h → ...rnal/qwtpolar-1.1.1/qwt_polar_magnifier.h b/.../gps/qwtpolar-1.1.1/qwt_polar_magnifier.h → ...rnal/qwtpolar-1.1.1/qwt_polar_magnifier.h
diff --git a/...p/gps/qwtpolar-1.1.1/qwt_polar_marker.cpp → external/qwtpolar-1.1.1/qwt_polar_marker.cpp b/...p/gps/qwtpolar-1.1.1/qwt_polar_marker.cpp → external/qwtpolar-1.1.1/qwt_polar_marker.cpp
diff --git a/...app/gps/qwtpolar-1.1.1/qwt_polar_marker.h → external/qwtpolar-1.1.1/qwt_polar_marker.h b/...app/gps/qwtpolar-1.1.1/qwt_polar_marker.h → external/qwtpolar-1.1.1/qwt_polar_marker.h
diff --git a/...p/gps/qwtpolar-1.1.1/qwt_polar_panner.cpp → external/qwtpolar-1.1.1/qwt_polar_panner.cpp b/...p/gps/qwtpolar-1.1.1/qwt_polar_panner.cpp → external/qwtpolar-1.1.1/qwt_polar_panner.cpp
diff --git a/...app/gps/qwtpolar-1.1.1/qwt_polar_panner.h → external/qwtpolar-1.1.1/qwt_polar_panner.h b/...app/gps/qwtpolar-1.1.1/qwt_polar_panner.h → external/qwtpolar-1.1.1/qwt_polar_panner.h
diff --git a/...p/gps/qwtpolar-1.1.1/qwt_polar_picker.cpp → external/qwtpolar-1.1.1/qwt_polar_picker.cpp b/...p/gps/qwtpolar-1.1.1/qwt_polar_picker.cpp → external/qwtpolar-1.1.1/qwt_polar_picker.cpp
diff --git a/...app/gps/qwtpolar-1.1.1/qwt_polar_picker.h → external/qwtpolar-1.1.1/qwt_polar_picker.h b/...app/gps/qwtpolar-1.1.1/qwt_polar_picker.h → external/qwtpolar-1.1.1/qwt_polar_picker.h
diff --git a/...app/gps/qwtpolar-1.1.1/qwt_polar_plot.cpp → external/qwtpolar-1.1.1/qwt_polar_plot.cpp b/...app/gps/qwtpolar-1.1.1/qwt_polar_plot.cpp → external/qwtpolar-1.1.1/qwt_polar_plot.cpp
diff --git a/src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.h → external/qwtpolar-1.1.1/qwt_polar_plot.h b/src/app/gps/qwtpolar-1.1.1/qwt_polar_plot.h → external/qwtpolar-1.1.1/qwt_polar_plot.h
diff --git a/...gps/qwtpolar-1.1.1/qwt_polar_renderer.cpp → ...nal/qwtpolar-1.1.1/qwt_polar_renderer.cpp b/...gps/qwtpolar-1.1.1/qwt_polar_renderer.cpp → ...nal/qwtpolar-1.1.1/qwt_polar_renderer.cpp
diff --git a/...p/gps/qwtpolar-1.1.1/qwt_polar_renderer.h → external/qwtpolar-1.1.1/qwt_polar_renderer.h b/...p/gps/qwtpolar-1.1.1/qwt_polar_renderer.h → external/qwtpolar-1.1.1/qwt_polar_renderer.h
diff --git a/.../qwtpolar-1.1.1/qwt_polar_spectrogram.cpp → .../qwtpolar-1.1.1/qwt_polar_spectrogram.cpp b/.../qwtpolar-1.1.1/qwt_polar_spectrogram.cpp → .../qwtpolar-1.1.1/qwt_polar_spectrogram.cpp
diff --git a/...ps/qwtpolar-1.1.1/qwt_polar_spectrogram.h → ...al/qwtpolar-1.1.1/qwt_polar_spectrogram.h b/...ps/qwtpolar-1.1.1/qwt_polar_spectrogram.h → ...al/qwtpolar-1.1.1/qwt_polar_spectrogram.h
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -456,33 +456,33 @@ IF (WITH_QWTPOLAR)
   IF(WITH_INTERNAL_QWTPOLAR)
     SET(QGIS_APP_SRCS
       ${QGIS_APP_SRCS}
-      gps/qwtpolar-1.1.1/qwt_polar_canvas.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_curve.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_fitter.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_grid.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_item.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_itemdict.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_layout.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_magnifier.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_marker.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_panner.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_picker.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_plot.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_renderer.cpp
-      gps/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_canvas.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_curve.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_fitter.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_grid.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_item.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_itemdict.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_layout.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_magnifier.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_marker.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_panner.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_picker.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_plot.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_renderer.cpp
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp
     )
 
     SET (QGIS_APP_MOC_HDRS
       ${QGIS_APP_MOC_HDRS}
-      gps/qwtpolar-1.1.1/qwt_polar_canvas.h
-      gps/qwtpolar-1.1.1/qwt_polar_magnifier.h
-      gps/qwtpolar-1.1.1/qwt_polar_panner.h
-      gps/qwtpolar-1.1.1/qwt_polar_picker.h
-      gps/qwtpolar-1.1.1/qwt_polar_plot.h
-      gps/qwtpolar-1.1.1/qwt_polar_renderer.h
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_canvas.h
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_magnifier.h
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_panner.h
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_picker.h
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_plot.h
+      ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1/qwt_polar_renderer.h
     )
 
-    SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-1.1.1)
+    SET(QWTPOLAR_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/qwtpolar-1.1.1)
 
     SET(QWTPOLAR_LIBRARY "")
   ENDIF(WITH_INTERNAL_QWTPOLAR)