File tree 3 files changed +4
-7
lines changed
3 files changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -45,7 +45,8 @@ SET (PLUGINS_ALSO_BINARIES FALSE)
45
45
# try to configure and build GRASS plugin by default
46
46
SET (WITH_GRASS TRUE CACHE BOOL "Determines whether GRASS plugin should be built" )
47
47
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" )
49
50
ENDIF (WITH_GRASS)
50
51
51
52
# try to configure and build POSTGRESQL support
@@ -145,9 +146,6 @@ ENDIF (NOT WITH_INTERNAL_SPATIALITE)
145
146
IF (WITH_POSTGRESQL)
146
147
FIND_PACKAGE (Postgres) # PostgreSQL provider, SPIT plugin
147
148
ENDIF (WITH_POSTGRESQL)
148
- IF (WITH_GRASS)
149
- FIND_PACKAGE (GRASS) # GRASS plugin
150
- ENDIF (WITH_GRASS)
151
149
IF (WITH_QWT)
152
150
FIND_PACKAGE (QWT)
153
151
ENDIF (WITH_QWT)
Original file line number Diff line number Diff line change @@ -44,7 +44,7 @@ ENDMACRO (CHECK_GRASS)
44
44
# search for grass installations
45
45
46
46
# 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 )
48
48
49
49
# mac-specific path
50
50
IF (APPLE )
Original file line number Diff line number Diff line change 17
17
#MESSAGE("Searching for QWT")
18
18
FIND_PATH (QWT_INCLUDE_DIR qwt.h
19
19
/usr/include
20
- /usr/include /qwt-qt4
21
20
/usr/local/include
22
21
"$ENV{LIB_DIR} /include"
23
- " $ENV{LIB_DIR} /include/ qwt"
22
+ PATH_SUFFIXES qwt-qt4 qwt
24
23
)
25
24
FIND_LIBRARY (QWT_LIBRARY qwt PATHS
26
25
/usr/lib
You can’t perform that action at this time.
0 commit comments