Skip to content

Commit 8a2ea36

Browse files
committedJan 8, 2012
[FEATURE] make desktop build optional (but default; fixes #4756)
1 parent 18451fd commit 8a2ea36

File tree

5 files changed

+27
-17
lines changed

5 files changed

+27
-17
lines changed
 

‎CMakeLists.txt

Lines changed: 5 additions & 3 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

@@ -134,8 +136,6 @@ 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)
141141

@@ -186,7 +186,9 @@ SET(QT_USE_QTXML 1)
186186
SET(QT_USE_QTNETWORK 1)
187187
SET(QT_USE_QTSVG 1)
188188
SET(QT_USE_QTSQL 1)
189-
SET(QT_USE_QTWEBKIT 1)
189+
IF(WITH_DESKTOP)
190+
SET(QT_USE_QTWEBKIT 1)
191+
ENDIF(WITH_DESKTOP)
190192

191193
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)
192194
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")

‎src/CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ ADD_SUBDIRECTORY(core)
22
ADD_SUBDIRECTORY(analysis)
33
ADD_SUBDIRECTORY(ui)
44
ADD_SUBDIRECTORY(gui)
5-
ADD_SUBDIRECTORY(app)
65
ADD_SUBDIRECTORY(providers)
7-
ADD_SUBDIRECTORY(plugins)
8-
ADD_SUBDIRECTORY(helpviewer)
96
ADD_SUBDIRECTORY(crssync)
10-
ADD_SUBDIRECTORY(browser)
7+
8+
IF (WITH_DESKTOP)
9+
ADD_SUBDIRECTORY(app)
10+
ADD_SUBDIRECTORY(helpviewer)
11+
ADD_SUBDIRECTORY(browser)
12+
ADD_SUBDIRECTORY(plugins)
13+
ENDIF(WITH_DESKTOP)
1114

1215
IF (WITH_BINDINGS)
1316
ADD_SUBDIRECTORY(python)

‎src/plugins/CMakeLists.txt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ ADD_SUBDIRECTORY(spatialquery)
1414
ADD_SUBDIRECTORY(sqlanywhere)
1515
ADD_SUBDIRECTORY(roadgraph)
1616
ADD_SUBDIRECTORY(zonal_statistics)
17+
ADD_SUBDIRECTORY(georeferencer)
18+
ADD_SUBDIRECTORY(gps_importer)
1719

1820
IF (WITH_SPATIALITE)
1921
ADD_SUBDIRECTORY(offline_editing)
@@ -23,20 +25,12 @@ IF (POSTGRES_FOUND)
2325
ADD_SUBDIRECTORY(spit)
2426
ENDIF (POSTGRES_FOUND)
2527

26-
IF (EXPAT_FOUND)
27-
ADD_SUBDIRECTORY(gps_importer)
28-
ENDIF (EXPAT_FOUND)
29-
30-
IF (GSL_FOUND)
31-
ADD_SUBDIRECTORY(georeferencer)
32-
ENDIF (GSL_FOUND)
33-
3428
IF (GRASS_FOUND)
3529
ADD_SUBDIRECTORY(grass)
3630
ENDIF (GRASS_FOUND)
3731

38-
IF (OSGEARTH_FOUND)
32+
IF (WITH_GLOBE)
3933
ADD_SUBDIRECTORY(globe)
40-
ENDIF (OSGEARTH_FOUND)
34+
ENDIF (WITH_GLOBE)
4135

4236
# headers installed in qgis_core target

‎src/plugins/georeferencer/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
FIND_PACKAGE(GSL) # Georeferencer
2+
3+
IF(GSL_FOUND)
4+
15
########################################################
26
# Files
37

@@ -91,3 +95,5 @@ TARGET_LINK_LIBRARIES(georefplugin
9195
INSTALL(TARGETS georefplugin
9296
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
9397
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
98+
99+
ENDIF(GSL_FOUND)

‎src/plugins/gps_importer/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
FIND_PACKAGE(Expat) # GPS importer plugin
2+
3+
IF(EXPAT_FOUND)
14

25
########################################################
36
# Files
@@ -57,3 +60,5 @@ TARGET_LINK_LIBRARIES(gpsimporterplugin
5760
INSTALL(TARGETS gpsimporterplugin
5861
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
5962
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
63+
64+
ENDIF(EXPAT_FOUND)

0 commit comments

Comments
 (0)
Please sign in to comment.