[QGIS Commit] r15215 - in trunk/qgis: . cmake

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-19 12:09:21 -0800 (Sat, 19 Feb 2011)
New Revision: 15215

Added:
   trunk/qgis/cmake/FindQwt.cmake
Removed:
   trunk/qgis/cmake/FindQWT.cmake
Modified:
   trunk/qgis/CMakeLists.txt
   trunk/qgis/cmake/FindQwtPolar.cmake
Log:
apply #3506

Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2011-02-19 18:53:40 UTC (rev 15214)
+++ trunk/qgis/CMakeLists.txt	2011-02-19 20:09:21 UTC (rev 15215)
@@ -63,7 +63,7 @@
   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(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)

Deleted: trunk/qgis/cmake/FindQWT.cmake
===================================================================
--- trunk/qgis/cmake/FindQWT.cmake	2011-02-19 18:53:40 UTC (rev 15214)
+++ trunk/qgis/cmake/FindQWT.cmake	2011-02-19 20:09:21 UTC (rev 15215)
@@ -1,43 +0,0 @@
-# Find Qwt
-# ~~~~~~~~
-# Copyright (c) 2010, Tim Sutton <tim at linfiniti.com>
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-# 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 
-#
-
-
-#MESSAGE("Searching for QWT")
-FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
-  /usr/include
-  /usr/local/include
-  "$ENV{LIB_DIR}/include" 
-  "$ENV{INCLUDE}" 
-  PATH_SUFFIXES qwt-qt4 qwt qwt5
-  )
-
-FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwt5 qwt-qt4 qwt5-qt4 PATHS 
-  /usr/lib
-  /usr/local/lib
-  "$ENV{LIB_DIR}/lib" 
-  "$ENV{LIB}/lib" 
-  )
-
-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)

Copied: trunk/qgis/cmake/FindQwt.cmake (from rev 15214, trunk/qgis/cmake/FindQWT.cmake)
===================================================================
--- trunk/qgis/cmake/FindQwt.cmake	                        (rev 0)
+++ trunk/qgis/cmake/FindQwt.cmake	2011-02-19 20:09:21 UTC (rev 15215)
@@ -0,0 +1,42 @@
+# Find Qwt
+# ~~~~~~~~
+# Copyright (c) 2010, Tim Sutton <tim at linfiniti.com>
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+# 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 
+#
+
+
+FIND_PATH(QWT_INCLUDE_DIR NAMES qwt.h PATHS
+  /usr/include
+  /usr/local/include
+  "$ENV{LIB_DIR}/include" 
+  "$ENV{INCLUDE}" 
+  PATH_SUFFIXES qwt-qt4 qwt qwt5
+  )
+
+FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwt5 qwt-qt4 qwt5-qt4 PATHS 
+  /usr/lib
+  /usr/local/lib
+  "$ENV{LIB_DIR}/lib" 
+  "$ENV{LIB}/lib" 
+  )
+
+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)

Modified: trunk/qgis/cmake/FindQwtPolar.cmake
===================================================================
--- trunk/qgis/cmake/FindQwtPolar.cmake	2011-02-19 18:53:40 UTC (rev 15214)
+++ trunk/qgis/cmake/FindQwtPolar.cmake	2011-02-19 20:09:21 UTC (rev 15215)
@@ -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 @@
 
 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)