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

[svn_qgis at osgeo.org]

Author: gjm
Date: 2010-07-18 11:48:34 +0000 (Sun, 18 Jul 2010)
New Revision: 13928

Modified:
   trunk/qgis/CMakeLists.txt
   trunk/qgis/cmake/FindGRASS.cmake
   trunk/qgis/cmake/FindQWT.cmake
Log:
Apply patches in #2863 (configuration changes to make ccmake work with
less manual configuration).


Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2010-07-17 21:34:31 UTC (rev 13927)
+++ trunk/qgis/CMakeLists.txt	2010-07-18 11:48:34 UTC (rev 13928)
@@ -45,7 +45,8 @@
 # try to configure and build GRASS plugin by default
 SET (WITH_GRASS TRUE CACHE BOOL "Determines whether GRASS plugin should be built")
 IF (WITH_GRASS)
-  SET (GRASS_PREFIX "" CACHE PATH "Path to GRASS base directory")
+  FIND_PACKAGE(GRASS)
+  SET (GRASS_PREFIX ${GRASS_PREFIX} CACHE PATH "Path to GRASS base directory")
 ENDIF (WITH_GRASS)
 
 # try to configure and build POSTGRESQL support
@@ -145,9 +146,6 @@
 IF (WITH_POSTGRESQL)
   FIND_PACKAGE(Postgres) # PostgreSQL provider, SPIT plugin
 ENDIF (WITH_POSTGRESQL)
-IF (WITH_GRASS)
-  FIND_PACKAGE(GRASS)    # GRASS plugin
-ENDIF (WITH_GRASS)
 IF (WITH_QWT)
   FIND_PACKAGE(QWT)
 ENDIF(WITH_QWT)

Modified: trunk/qgis/cmake/FindGRASS.cmake
===================================================================
--- trunk/qgis/cmake/FindGRASS.cmake	2010-07-17 21:34:31 UTC (rev 13927)
+++ trunk/qgis/cmake/FindGRASS.cmake	2010-07-18 11:48:34 UTC (rev 13928)
@@ -44,7 +44,7 @@
 # search for grass installations
 
 # list of paths which to search - user's choice as first
-SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local)
+SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local /opt/grass)
 
 # mac-specific path
 IF (APPLE)

Modified: trunk/qgis/cmake/FindQWT.cmake
===================================================================
--- trunk/qgis/cmake/FindQWT.cmake	2010-07-17 21:34:31 UTC (rev 13927)
+++ trunk/qgis/cmake/FindQWT.cmake	2010-07-18 11:48:34 UTC (rev 13928)
@@ -17,10 +17,9 @@
 #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"
+  PATH_SUFFIXES qwt-qt4 qwt
   )
 FIND_LIBRARY(QWT_LIBRARY qwt PATHS 
   /usr/lib