Skip to content
Permalink
Browse files
fix some issues with the GPS commit
git-svn-id: http://svn.osgeo.org/qgis/trunk@12695 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jan 7, 2010
1 parent 7c19e39 commit 3a028cf61e12d5a2c20654abeb7b65f741c65b1f
Showing with 6,024 additions and 6,038 deletions.
  1. +0 −47 cmake/FindQWT.cmake
  2. +2 −0 ms-windows/osgeo4w/package.cmd
  3. +2 −0 scripts/spelling.dat
  4. +159 −158 src/app/gps/qgsgpsinformationwidget.cpp
  5. +6 −6 src/app/gps/qgsgpsinformationwidget.h
  6. +5 −5 src/app/gps/qgsgpsmarker.cpp
  7. +1 −1 src/app/gps/qgsgpsmarker.h
  8. +42 −42 src/app/gps/qwtpolar/qwt_polar.h
  9. +113 −113 src/app/gps/qwtpolar/qwt_polar_canvas.cpp
  10. +13 −13 src/app/gps/qwtpolar/qwt_polar_canvas.h
  11. +227 −227 src/app/gps/qwtpolar/qwt_polar_curve.cpp
  12. +48 −48 src/app/gps/qwtpolar/qwt_polar_curve.h
  13. +36 −36 src/app/gps/qwtpolar/qwt_polar_fitter.cpp
  14. +6 −6 src/app/gps/qwtpolar/qwt_polar_fitter.h
  15. +667 −651 src/app/gps/qwtpolar/qwt_polar_grid.cpp
  16. +62 −62 src/app/gps/qwtpolar/qwt_polar_grid.h
  17. +158 −158 src/app/gps/qwtpolar/qwt_polar_item.cpp
  18. +39 −39 src/app/gps/qwtpolar/qwt_polar_item.h
  19. +65 −65 src/app/gps/qwtpolar/qwt_polar_itemdict.cpp
  20. +7 −7 src/app/gps/qwtpolar/qwt_polar_itemdict.h
  21. +266 −266 src/app/gps/qwtpolar/qwt_polar_layout.cpp
  22. +14 −14 src/app/gps/qwtpolar/qwt_polar_layout.h
  23. +61 −61 src/app/gps/qwtpolar/qwt_polar_magnifier.cpp
  24. +8 −8 src/app/gps/qwtpolar/qwt_polar_magnifier.h
  25. +90 −90 src/app/gps/qwtpolar/qwt_polar_marker.cpp
  26. +12 −12 src/app/gps/qwtpolar/qwt_polar_marker.h
  27. +59 −59 src/app/gps/qwtpolar/qwt_polar_panner.cpp
  28. +6 −6 src/app/gps/qwtpolar/qwt_polar_panner.h
  29. +726 −714 src/app/gps/qwtpolar/qwt_polar_plot.cpp
  30. +61 −61 src/app/gps/qwtpolar/qwt_polar_plot.h
  31. +28 −28 src/app/gps/qwtpolar/qwt_polar_point.cpp
  32. +36 −36 src/app/gps/qwtpolar/qwt_polar_point.h
  33. +155 −155 src/app/gps/qwtpolar/qwt_polar_spectrogram.cpp
  34. +12 −12 src/app/gps/qwtpolar/qwt_polar_spectrogram.h
  35. +1 −1 src/core/gps/gmath.c
  36. +1 −1 src/core/gps/parse.c
  37. +1,178 −1,178 src/core/gps/posix_qextserialport.cpp
  38. +57 −57 src/core/gps/posix_qextserialport.h
  39. +255 −255 src/core/gps/qextserialbase.cpp
  40. +204 −204 src/core/gps/qextserialbase.h
  41. +98 −98 src/core/gps/qextserialport.cpp
  42. +25 −25 src/core/gps/qextserialport.h
  43. +1 −1 src/core/gps/tok.c
  44. +963 −963 src/core/gps/win_qextserialport.cpp
  45. +49 −49 src/core/gps/win_qextserialport.h
@@ -44,50 +44,3 @@ ELSE (QWT_FOUND)
MESSAGE(FATAL_ERROR "Could not find QWT")
ENDIF (QWT_FIND_REQUIRED)
ENDIF (QWT_FOUND)
## Once run this will define:
##
## QWT_FOUND = system has QWT lib
##
## QWT_LIBRARY = full path to the QWT library
##
## QWT_INCLUDE_DIR = where to find headers
##
## Tim Sutton


#MESSAGE("Searching for QWT")
FIND_PATH(QWT_INCLUDE_DIR qwt.h
/usr/include
/usr/include/qwt-qt4
/usr/local/include
"$ENV{LIB_DIR}/include"
"$ENV{LIB_DIR}/include/qwt"
)
FIND_LIBRARY(QWT_LIBRARY qwt PATHS
/usr/lib
/usr/local/lib
"$ENV{LIB_DIR}/lib"
)
IF (NOT QWT_LIBRARY)
# try using ubuntu lib naming
FIND_LIBRARY(QWT_LIBRARY qwt-qt4 PATHS
/usr/lib
/usr/local/lib
"$ENV{LIB_DIR}/lib"
)
ENDIF (NOT QWT_LIBRARY)

IF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
SET(QWT_FOUND TRUE)
ENDIF (QWT_INCLUDE_DIR AND QWT_LIBRARY)

IF (QWT_FOUND)
IF (NOT QWT_FIND_QUIETLY)
MESSAGE(STATUS "Found QWT : ${QWT_LIBRARY}")
ENDIF (NOT QWT_FIND_QUIETLY)
ELSE (QWT_FOUND)
IF (QWT_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find QWT")
ENDIF (QWT_FIND_REQUIRED)
ENDIF (QWT_FOUND)

@@ -101,6 +101,8 @@ cmake -G "Visual Studio 9 2008" ^
-D QT_HEADERS_DIR=%O4W_ROOT%/include/qt4 ^
-D QT_ZLIB_LIBRARY=%O4W_ROOT%/lib/zlib.lib ^
-D QT_PNG_LIBRARY=%O4W_ROOT%/lib/libpng13.lib ^
-D QWT_INCLUDE_DIR=%O4W_ROOT%/include/qwt ^
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
-D CMAKE_INSTALL_PREFIX=%O4W_ROOT%/apps/%PACKAGENAME% ^
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /Od /D NDEBUG" ^
-D SVNVERSION="%SVNVERSION%" ^
@@ -446,3 +446,5 @@ colour:color
recommeneded:recommended
implementaed:implemented
containging:containing
intersecton:intersection
intersectons:intersections

0 comments on commit 3a028cf

Please sign in to comment.