|
1
|
Index: cmake/FindQWT.cmake
|
|
2
|
===================================================================
|
|
3
|
--- cmake/FindQWT.cmake (revision 13881)
|
|
4
|
+++ cmake/FindQWT.cmake (working copy)
|
|
5
|
@@ -17,10 +17,9 @@
|
|
6
|
#MESSAGE("Searching for QWT")
|
|
7
|
FIND_PATH(QWT_INCLUDE_DIR qwt.h
|
|
8
|
/usr/include
|
|
9
|
- /usr/include/qwt-qt4
|
|
10
|
/usr/local/include
|
|
11
|
"$ENV{LIB_DIR}/include"
|
|
12
|
- "$ENV{LIB_DIR}/include/qwt"
|
|
13
|
+ PATH_SUFFIXES qwt-qt4 qwt
|
|
14
|
)
|
|
15
|
FIND_LIBRARY(QWT_LIBRARY qwt PATHS
|
|
16
|
/usr/lib
|
|
17
|
Index: cmake/FindGRASS.cmake
|
|
18
|
===================================================================
|
|
19
|
--- cmake/FindGRASS.cmake (revision 13881)
|
|
20
|
+++ cmake/FindGRASS.cmake (working copy)
|
|
21
|
@@ -44,7 +44,7 @@
|
|
22
|
# search for grass installations
|
|
23
|
|
|
24
|
# list of paths which to search - user's choice as first
|
|
25
|
-SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local)
|
|
26
|
+SET (GRASS_PATHS ${GRASS_PREFIX} /usr/lib/grass c:/msys/local /opt/grass)
|
|
27
|
|
|
28
|
# mac-specific path
|
|
29
|
IF (APPLE)
|
|
30
|
Index: src/app/qgisapp.cpp
|
|
31
|
===================================================================
|
|
32
|
--- src/app/qgisapp.cpp (revision 13881)
|
|
33
|
+++ src/app/qgisapp.cpp (working copy)
|
|
34
|
@@ -4931,7 +4931,7 @@
|
|
35
|
void QgisApp::loadPythonSupport()
|
|
36
|
{
|
|
37
|
QString pythonlibName( "qgispython" );
|
|
38
|
-#ifdef Q_WS_MAC
|
|
39
|
+#if defined(Q_WS_MAC) || defined(Q_OS_LINUX)
|
|
40
|
pythonlibName.prepend( QgsApplication::prefixPath() + "/lib/" );
|
|
41
|
#endif
|
|
42
|
#ifdef __MINGW32__
|
|
43
|
Index: CMakeLists.txt
|
|
44
|
===================================================================
|
|
45
|
--- CMakeLists.txt (revision 13881)
|
|
46
|
+++ CMakeLists.txt (working copy)
|
|
47
|
@@ -45,7 +45,8 @@
|
|
48
|
# try to configure and build GRASS plugin by default
|
|
49
|
SET (WITH_GRASS TRUE CACHE BOOL "Determines whether GRASS plugin should be built")
|
|
50
|
IF (WITH_GRASS)
|
|
51
|
- SET (GRASS_PREFIX "" CACHE PATH "Path to GRASS base directory")
|
|
52
|
+ FIND_PACKAGE(GRASS)
|
|
53
|
+ SET (GRASS_PREFIX ${GRASS_PREFIX} CACHE PATH "Path to GRASS base directory")
|
|
54
|
ENDIF (WITH_GRASS)
|
|
55
|
|
|
56
|
# try to configure and build POSTGRESQL support
|
|
57
|
@@ -145,9 +146,6 @@
|
|
58
|
IF (WITH_POSTGRESQL)
|
|
59
|
FIND_PACKAGE(Postgres) # PostgreSQL provider, SPIT plugin
|
|
60
|
ENDIF (WITH_POSTGRESQL)
|
|
61
|
-IF (WITH_GRASS)
|
|
62
|
- FIND_PACKAGE(GRASS) # GRASS plugin
|
|
63
|
-ENDIF (WITH_GRASS)
|
|
64
|
IF (WITH_QWT)
|
|
65
|
FIND_PACKAGE(QWT)
|
|
66
|
ENDIF(WITH_QWT)
|