Skip to content
Permalink
Browse files

minor tweaks for iOS build

  • Loading branch information
PeterPetrik committed Oct 11, 2018
1 parent 7564276 commit bddf8a817b2b67f4789bb9ea025cd28ee8385373
@@ -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
@@ -1,4 +1,6 @@
ADD_SUBDIRECTORY(native)
IF (NOT IOS)
ADD_SUBDIRECTORY(native)
ENDIF (NOT IOS)

ADD_SUBDIRECTORY(core)
ADD_SUBDIRECTORY(analysis)
@@ -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)
@@ -33,6 +33,7 @@
#include "qgslayoutpagecollection.h"
#include "qgslayoutreportcontext.h"
#include "qgsexpressionutils.h"
#include "qgslayoutrendercontext.h"

#include <QSettings>
#include <QDir>
@@ -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)

0 comments on commit bddf8a8

Please sign in to comment.
You can’t perform that action at this time.