Skip to content
Permalink
Browse files
apply #3506
git-svn-id: http://svn.osgeo.org/qgis/trunk@15215 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Feb 19, 2011
1 parent 05c7708 commit a9d4b575b1ca897ff91efc0b457b1ae2e5697140
Showing with 10 additions and 12 deletions.
  1. +3 −3 CMakeLists.txt
  2. +2 −3 cmake/{FindQWT.cmake → FindQwt.cmake}
  3. +5 −6 cmake/FindQwtPolar.cmake
@@ -63,7 +63,7 @@ IF (WITH_POSTGRESQL)
SET (POSTGRESQL_PREFIX "" CACHE PATH "Path to POSTGRESQL base directory")
ENDIF (WITH_POSTGRESQL)

SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal built of QWTPolar")
SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal built of QwtPolar")

SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")

@@ -142,9 +142,9 @@ FIND_PACKAGE(Expat) # GPS importer plugin
FIND_PACKAGE(GSL) # Georeferencer
FIND_PACKAGE(GEOS)
FIND_PACKAGE(GDAL)
FIND_PACKAGE(QWT REQUIRED)
FIND_PACKAGE(Qwt REQUIRED)
IF (NOT WITH_INTERNAL_QWTPOLAR)
FIND_PACKAGE(QWTPOLAR REQUIRED)
FIND_PACKAGE(QwtPolar REQUIRED)
ENDIF(NOT WITH_INTERNAL_QWTPOLAR)

IF (NOT WITH_INTERNAL_SPATIALITE)
@@ -12,7 +12,6 @@
#


#MESSAGE("Searching for QWT")
FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
/usr/include
/usr/local/include
@@ -34,10 +33,10 @@ ENDIF (QWT_INCLUDE_DIR AND QWT_LIBRARY)

IF (QWT_FOUND)
IF (NOT QWT_FIND_QUIETLY)
MESSAGE(STATUS "Found QWT: ${QWT_LIBRARY}")
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")
MESSAGE(FATAL_ERROR "Could not find Qwt")
ENDIF (QWT_FIND_REQUIRED)
ENDIF (QWT_FOUND)
@@ -7,19 +7,18 @@
#
# Once run this will define:
#
# QWTPOLAR_FOUND = system has QWTPolar lib
# QWTPOLAR_LIBRARY = full path to the QWTPolar library
# QWTPOLAR_FOUND = system has QwtPolar lib
# QWTPOLAR_LIBRARY = full path to the QwtPolar library
# QWTPOLAR_INCLUDE_DIR = where to find headers
#


#MESSAGE("Searching for QWTPolar")
FIND_PATH(QWTPOLAR_INCLUDE_DIR NAMES qwt_polar.h PATHS
/usr/include
/usr/local/include
"$ENV{LIB_DIR}/include"
"$ENV{INCLUDE}"
PATH_SUFFIXES qwt-qt4 qwt qwt5
PATH_SUFFIXES qwtpolar
)

FIND_LIBRARY(QWTPOLAR_LIBRARY NAMES qwtpolar PATHS
@@ -35,10 +34,10 @@ ENDIF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY)

IF (QWTPOLAR_FOUND)
IF (NOT QWTPOLAR_FIND_QUIETLY)
MESSAGE(STATUS "Found QWTPolar: ${QWTPOLAR_LIBRARY}")
MESSAGE(STATUS "Found QwtPolar: ${QWTPOLAR_LIBRARY}")
ENDIF (NOT QWTPOLAR_FIND_QUIETLY)
ELSE (QWTPOLAR_FOUND)
IF (QWTPOLAR_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find QWTPolar")
MESSAGE(FATAL_ERROR "Could not find QwtPolar")
ENDIF (QWTPOLAR_FIND_REQUIRED)
ENDIF (QWTPOLAR_FOUND)

0 comments on commit a9d4b57

Please sign in to comment.