Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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 3a028cf
Show file tree
Hide file tree
Showing 45 changed files with 6,024 additions and 6,038 deletions.
47 changes: 0 additions & 47 deletions cmake/FindQWT.cmake
Expand Up @@ -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)

2 changes: 2 additions & 0 deletions ms-windows/osgeo4w/package.cmd
Expand Up @@ -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%" ^
Expand Down
2 changes: 2 additions & 0 deletions scripts/spelling.dat
Expand Up @@ -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.