Skip to content
Permalink
Browse files
[FEATURE] make desktop build optional (but default; fixes #4756)
  • Loading branch information
jef-n committed Jan 8, 2012
1 parent 18451fd commit 8a2ea36a6e5c114fbe4e77d35729fadefabca8d1
Showing with 27 additions and 17 deletions.
  1. +5 −3 CMakeLists.txt
  2. +7 −4 src/CMakeLists.txt
  3. +4 −10 src/plugins/CMakeLists.txt
  4. +6 −0 src/plugins/georeferencer/CMakeLists.txt
  5. +5 −0 src/plugins/gps_importer/CMakeLists.txt
@@ -39,6 +39,8 @@ IF (WITH_GRASS)
SET (GRASS_PREFIX ${GRASS_PREFIX} CACHE PATH "Path to GRASS base directory")
ENDIF (WITH_GRASS)

SET (WITH_DESKTOP TRUE CACHE BOOL "Determines whether QGIS desktop should be built")

# mapserver by us disabled default because it needs FastCGI (which is optional dependency)
SET (WITH_MAPSERVER FALSE CACHE BOOL "Determines whether QGIS mapserver should be built")

@@ -134,8 +136,6 @@ ENDIF(NOT WIN32 AND NOT ANDROID)

# required
FIND_PACKAGE(Proj)
FIND_PACKAGE(Expat) # GPS importer plugin
FIND_PACKAGE(GSL) # Georeferencer
FIND_PACKAGE(GEOS)
FIND_PACKAGE(GDAL)

@@ -186,7 +186,9 @@ SET(QT_USE_QTXML 1)
SET(QT_USE_QTNETWORK 1)
SET(QT_USE_QTSVG 1)
SET(QT_USE_QTSQL 1)
SET(QT_USE_QTWEBKIT 1)
IF(WITH_DESKTOP)
SET(QT_USE_QTWEBKIT 1)
ENDIF(WITH_DESKTOP)

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)
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
@@ -2,12 +2,15 @@ ADD_SUBDIRECTORY(core)
ADD_SUBDIRECTORY(analysis)
ADD_SUBDIRECTORY(ui)
ADD_SUBDIRECTORY(gui)
ADD_SUBDIRECTORY(app)
ADD_SUBDIRECTORY(providers)
ADD_SUBDIRECTORY(plugins)
ADD_SUBDIRECTORY(helpviewer)
ADD_SUBDIRECTORY(crssync)
ADD_SUBDIRECTORY(browser)

IF (WITH_DESKTOP)
ADD_SUBDIRECTORY(app)
ADD_SUBDIRECTORY(helpviewer)
ADD_SUBDIRECTORY(browser)
ADD_SUBDIRECTORY(plugins)
ENDIF(WITH_DESKTOP)

IF (WITH_BINDINGS)
ADD_SUBDIRECTORY(python)
@@ -14,6 +14,8 @@ ADD_SUBDIRECTORY(spatialquery)
ADD_SUBDIRECTORY(sqlanywhere)
ADD_SUBDIRECTORY(roadgraph)
ADD_SUBDIRECTORY(zonal_statistics)
ADD_SUBDIRECTORY(georeferencer)
ADD_SUBDIRECTORY(gps_importer)

IF (WITH_SPATIALITE)
ADD_SUBDIRECTORY(offline_editing)
@@ -23,20 +25,12 @@ IF (POSTGRES_FOUND)
ADD_SUBDIRECTORY(spit)
ENDIF (POSTGRES_FOUND)

IF (EXPAT_FOUND)
ADD_SUBDIRECTORY(gps_importer)
ENDIF (EXPAT_FOUND)

IF (GSL_FOUND)
ADD_SUBDIRECTORY(georeferencer)
ENDIF (GSL_FOUND)

IF (GRASS_FOUND)
ADD_SUBDIRECTORY(grass)
ENDIF (GRASS_FOUND)

IF (OSGEARTH_FOUND)
IF (WITH_GLOBE)
ADD_SUBDIRECTORY(globe)
ENDIF (OSGEARTH_FOUND)
ENDIF (WITH_GLOBE)

# headers installed in qgis_core target
@@ -1,3 +1,7 @@
FIND_PACKAGE(GSL) # Georeferencer

IF(GSL_FOUND)

########################################################
# Files

@@ -91,3 +95,5 @@ TARGET_LINK_LIBRARIES(georefplugin
INSTALL(TARGETS georefplugin
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})

ENDIF(GSL_FOUND)
@@ -1,3 +1,6 @@
FIND_PACKAGE(Expat) # GPS importer plugin

IF(EXPAT_FOUND)

########################################################
# Files
@@ -57,3 +60,5 @@ TARGET_LINK_LIBRARIES(gpsimporterplugin
INSTALL(TARGETS gpsimporterplugin
RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})

ENDIF(EXPAT_FOUND)

0 comments on commit 8a2ea36

Please sign in to comment.