Skip to content

Commit

Permalink
Apply patches in #2863 (configuration changes to make ccmake work with
Browse files Browse the repository at this point in the history
less manual configuration).


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13928 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gjm committed Jul 18, 2010
1 parent 2ddc98b commit 355b9e2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
6 changes: 2 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion cmake/FindGRASS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions cmake/FindQWT.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 355b9e2

Please sign in to comment.