minor tweaks for iOS build

qgis · Nov 13, 2018 · bddf8a8 · bddf8a8
1 parent 7564276
commit bddf8a8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/cmake/FindSpatiaLite.cmake b/cmake/FindSpatiaLite.cmake
@@ -24,7 +24,7 @@ include(CheckLibraryExists)
 
 # try to use sqlite framework on mac
 # want clean framework path, not unix compatibility path
-IF (APPLE)
+IF (APPLE AND NOT IOS)
   IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
       OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
       OR NOT CMAKE_FIND_FRAMEWORK)
@@ -39,7 +39,7 @@ IF (APPLE)
     ENDIF (SPATIALITE_INCLUDE_DIR)
     SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
   ENDIF ()
-ENDIF (APPLE)
+ENDIF (APPLE AND NOT IOS)
 
 FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h
   /usr/include

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,6 @@
-ADD_SUBDIRECTORY(native)
+IF (NOT IOS)
+  ADD_SUBDIRECTORY(native)
+ENDIF (NOT IOS)
 
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(analysis)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1334,9 +1334,13 @@ IF (WIN32)
 ENDIF (WIN32)
 
 IF (APPLE)
-  TARGET_LINK_LIBRARIES(qgis_core qgis_native ${LIBTASN1_LIBRARY})
+  TARGET_LINK_LIBRARIES(qgis_core ${LIBTASN1_LIBRARY})
 ENDIF (APPLE)
 
+IF (APPLE AND NOT IOS)
+  TARGET_LINK_LIBRARIES(qgis_core qgis_native)
+ENDIF (APPLE AND NOT IOS)
+
 IF (QT_MOBILITY_LOCATION_FOUND)
   TARGET_LINK_LIBRARIES(qgis_core ${QT_MOBILITY_LOCATION_LIBRARY})
 ENDIF (QT_MOBILITY_LOCATION_FOUND)

diff --git a/src/core/qgsexpressioncontext.cpp b/src/core/qgsexpressioncontext.cpp
@@ -33,6 +33,7 @@
 #include "qgslayoutpagecollection.h"
 #include "qgslayoutreportcontext.h"
 #include "qgsexpressionutils.h"
+#include "qgslayoutrendercontext.h"
 
 #include <QSettings>
 #include <QDir>

diff --git a/src/providers/CMakeLists.txt b/src/providers/CMakeLists.txt
@@ -8,7 +8,9 @@ ADD_SUBDIRECTORY(wms)
 ADD_SUBDIRECTORY(delimitedtext)
 ADD_SUBDIRECTORY(gdal)
 ADD_SUBDIRECTORY(geonode)
+IF (NOT IOS)
 ADD_SUBDIRECTORY(mssql)
+ENDIF(NOT IOS)
 ADD_SUBDIRECTORY(ows)
 ADD_SUBDIRECTORY(wcs)
 ADD_SUBDIRECTORY(gpx)