allow to build without analysis

qgis · Dec 3, 2018 · efd1fd6 · efd1fd6
1 parent dcba255
commit efd1fd6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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")
+
   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)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -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)