Merge pull request #8591 from 3nids/without_analysis

allow to build QGIS without analysis
This commit is contained in:
Denis Rouzaud 2018-12-04 07:24:20 -04:00 committed by GitHub
commit f09e640498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions

View File

@ -112,6 +112,8 @@ IF(WITH_CORE)
SET (WITH_GUI TRUE CACHE BOOL "Determines whether QGIS GUI library (and everything built on top of it) should be built")
SET (WITH_ANALYSIS TRUE CACHE BOOL "Determines whether QGIS analysis library should be built")
SET (WITH_DESKTOP TRUE CACHE BOOL "Determines whether QGIS desktop should be built")
SET (WITH_3D FALSE CACHE BOOL "Determines whether QGIS 3D library should be built")
@ -145,6 +147,10 @@ IF(WITH_CORE)
SET (HAVE_GUI TRUE) # used in qgsconfig.h
ENDIF()
IF ( WITH_DESKTOP AND NOT WITH_ANALYSIS )
MESSAGE(FATAL_ERROR "Desktop cannot be built without analysis")
ENDIF()
# try to configure and build MDAL support
SET (WITH_INTERNAL_MDAL TRUE CACHE BOOL "Determines whether MDAL support should be built")
IF (NOT WITH_INTERNAL_MDAL)

View File

@ -25,7 +25,7 @@ SET(TS_FILES qgis_ar.ts qgis_bg.ts qgis_bs.ts qgis_ca.ts qgis_cs.ts qgis_da.ts q
ADD_TRANSLATION_FILES (QM_FILES ${TS_FILES})
IF (UNIX AND NOT APPLE)
IF (UNIX AND NOT APPLE AND PYQT5_FOUND)
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_BINARY_DIR}/org.qgis.qgis.desktop ${CMAKE_BINARY_DIR}/org.qgis.qgis.appdata.xml
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"

View File

@ -1,9 +1,9 @@
ADD_SUBDIRECTORY(native)
ADD_SUBDIRECTORY(core)
IF (NOT IOS)
IF (WITH_ANALYSIS)
ADD_SUBDIRECTORY(analysis)
ENDIF (NOT IOS)
ENDIF (WITH_ANALYSIS)
IF (WITH_GUI)
ADD_SUBDIRECTORY(ui)