Skip to content
Permalink
Browse files
Apply patches in #2863 (configuration changes to make ccmake work with
less manual configuration).


git-svn-id: http://svn.osgeo.org/qgis/trunk@13928 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gjm committed Jul 18, 2010
1 parent 5feb1dd commit b4545005d8cc07abaca0ea22d2541f37dfcab0f5
Showing with 4 additions and 7 deletions.
  1. +2 −4 CMakeLists.txt
  2. +1 −1 cmake/FindGRASS.cmake
  3. +1 −2 cmake/FindQWT.cmake
@@ -45,7 +45,8 @@ SET (PLUGINS_ALSO_BINARIES FALSE)
# 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 @@ ENDIF (NOT WITH_INTERNAL_SPATIALITE)
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)
@@ -44,7 +44,7 @@ ENDMACRO (CHECK_GRASS)
# 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)
@@ -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

0 comments on commit b454500

Please sign in to comment.