Skip to content

Commit 1be0e87

Browse files
committedFeb 5, 2012
Merge branch 'master' of git://github.com/qgis/Quantum-GIS
2 parents 876b8c7 + c933dce commit 1be0e87

File tree

672 files changed

+488055
-266709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

672 files changed

+488055
-266709
lines changed
 

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ doc/CODING.tex
3939
doc/INSTALL.tex
4040
scripts/Debug
4141
scripts/RelWithDebInfo
42+
/CMakeLists.txt.user

‎CMakeLists.txt

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ IF (WITH_GRASS)
3939
SET (GRASS_PREFIX ${GRASS_PREFIX} CACHE PATH "Path to GRASS base directory")
4040
ENDIF (WITH_GRASS)
4141

42+
SET (WITH_DESKTOP TRUE CACHE BOOL "Determines whether QGIS desktop should be built")
43+
4244
# mapserver by us disabled default because it needs FastCGI (which is optional dependency)
4345
SET (WITH_MAPSERVER FALSE CACHE BOOL "Determines whether QGIS mapserver should be built")
4446

@@ -117,7 +119,7 @@ ENDIF (NOT BISON_EXECUTABLE)
117119
#############################################################
118120
# search for dependencies
119121

120-
IF(NOT WIN32)
122+
IF(NOT WIN32 AND NOT ANDROID)
121123
INCLUDE(CheckFunctionExists)
122124
CHECK_FUNCTION_EXISTS(openpty OPENPTY_IN_LIBC)
123125
IF(NOT OPENPTY_IN_LIBC)
@@ -130,14 +132,13 @@ IF(NOT WIN32)
130132
MESSAGE (SEND_ERROR "openpty not found!")
131133
ENDIF(NEED_LIBUTIL)
132134
ENDIF(NOT OPENPTY_IN_LIBC)
133-
ENDIF(NOT WIN32)
135+
ENDIF(NOT WIN32 AND NOT ANDROID)
134136

135137
# required
136138
FIND_PACKAGE(Proj)
137-
FIND_PACKAGE(Expat) # GPS importer plugin
138-
FIND_PACKAGE(GSL) # Georeferencer
139139
FIND_PACKAGE(GEOS)
140140
FIND_PACKAGE(GDAL)
141+
FIND_PACKAGE(Expat)
141142

142143
IF (NOT WITH_INTERNAL_SPATIALINDEX)
143144
FIND_PACKAGE(Spatialindex REQUIRED)
@@ -186,11 +187,18 @@ SET(QT_USE_QTXML 1)
186187
SET(QT_USE_QTNETWORK 1)
187188
SET(QT_USE_QTSVG 1)
188189
SET(QT_USE_QTSQL 1)
189-
SET(QT_USE_QTWEBKIT 1)
190190

191-
IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND)
191+
IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND)
192192
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
193-
ENDIF ()
193+
ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND)
194+
195+
IF(WITH_DESKTOP)
196+
SET(QT_USE_QTWEBKIT 1)
197+
198+
IF(NOT QT_QTWEBKIT_FOUND)
199+
MESSAGE(SEND_ERROR "Qt Webkit module required for QGIS Desktop!")
200+
ENDIF(NOT QT_QTWEBKIT_FOUND)
201+
ENDIF(WITH_DESKTOP)
194202

195203
IF (ENABLE_TESTS)
196204
SET( QT_USE_QTTEST TRUE )
@@ -339,6 +347,10 @@ ELSE (WIN32)
339347

340348
ENDIF (WIN32)
341349

350+
IF (ANDROID)
351+
SET (DEFAULT_PLUGIN_SUBDIR lib)
352+
SET (DEFAULT_DATA_SUBDIR files/share)
353+
ENDIF (ANDROID)
342354

343355
#assume we have escaped compiler directives
344356
#eventually we want to change this to new

0 commit comments

Comments
 (0)