Skip to content

Commit 355b9e2

Browse files
author
gjm
committed
Apply patches in #2863 (configuration changes to make ccmake work with
less manual configuration). git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13928 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 2ddc98b commit 355b9e2

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ SET (PLUGINS_ALSO_BINARIES FALSE)
4545
# try to configure and build GRASS plugin by default
4646
SET (WITH_GRASS TRUE CACHE BOOL "Determines whether GRASS plugin should be built")
4747
IF (WITH_GRASS)
48-
SET (GRASS_PREFIX "" CACHE PATH "Path to GRASS base directory")
48+
FIND_PACKAGE(GRASS)
49+
SET (GRASS_PREFIX ${GRASS_PREFIX} CACHE PATH "Path to GRASS base directory")
4950
ENDIF (WITH_GRASS)
5051

5152
# try to configure and build POSTGRESQL support
@@ -145,9 +146,6 @@ ENDIF (NOT WITH_INTERNAL_SPATIALITE)
145146
IF (WITH_POSTGRESQL)
146147
FIND_PACKAGE(Postgres) # PostgreSQL provider, SPIT plugin
147148
ENDIF (WITH_POSTGRESQL)
148-
IF (WITH_GRASS)
149-
FIND_PACKAGE(GRASS) # GRASS plugin
150-
ENDIF (WITH_GRASS)
151149
IF (WITH_QWT)
152150
FIND_PACKAGE(QWT)
153151
ENDIF(WITH_QWT)

cmake/FindGRASS.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ENDMACRO (CHECK_GRASS)
4444
# search for grass installations
4545

4646
# list of paths which to search - user's choice as first
47-
SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local)
47+
SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local /opt/grass)
4848

4949
# mac-specific path
5050
IF (APPLE)

cmake/FindQWT.cmake

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
#MESSAGE("Searching for QWT")
1818
FIND_PATH(QWT_INCLUDE_DIR qwt.h
1919
/usr/include
20-
/usr/include/qwt-qt4
2120
/usr/local/include
2221
"$ENV{LIB_DIR}/include"
23-
"$ENV{LIB_DIR}/include/qwt"
22+
PATH_SUFFIXES qwt-qt4 qwt
2423
)
2524
FIND_LIBRARY(QWT_LIBRARY qwt PATHS
2625
/usr/lib

0 commit comments

Comments
 (0)