sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor tweaks for iOS build

Browse Source
This commit is contained in:
Peter Petrik 2018-10-11 13:57:35 +02:00
parent 7564276994
commit bddf8a817b
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/FindSpatiaLite.cmake
View File

@ -24,7 +24,7 @@ include(CheckLibraryExists)
# try to use sqlite framework on mac # try to use sqlite framework on mac
# want clean framework path, not unix compatibility path # want clean framework path, not unix compatibility path
IF (APPLE) IF (APPLE AND NOT IOS)
IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST" IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY" OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
OR NOT CMAKE_FIND_FRAMEWORK) OR NOT CMAKE_FIND_FRAMEWORK)
@ -39,7 +39,7 @@ IF (APPLE)
ENDIF (SPATIALITE_INCLUDE_DIR) ENDIF (SPATIALITE_INCLUDE_DIR)
SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE) SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
ENDIF () ENDIF ()
ENDIF (APPLE) ENDIF (APPLE AND NOT IOS)
FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h
/usr/include /usr/include

4
src/CMakeLists.txt
View File

@ -1,4 +1,6 @@
ADD_SUBDIRECTORY(native) IF (NOT IOS)
ADD_SUBDIRECTORY(native)
ENDIF (NOT IOS)
ADD_SUBDIRECTORY(core) ADD_SUBDIRECTORY(core)
ADD_SUBDIRECTORY(analysis) ADD_SUBDIRECTORY(analysis)

6
src/core/CMakeLists.txt
View File

@ -1334,9 +1334,13 @@ IF (WIN32)
ENDIF (WIN32) ENDIF (WIN32)
IF (APPLE) IF (APPLE)
TARGET_LINK_LIBRARIES(qgis_core qgis_native ${LIBTASN1_LIBRARY}) TARGET_LINK_LIBRARIES(qgis_core ${LIBTASN1_LIBRARY})
ENDIF (APPLE) ENDIF (APPLE)
IF (APPLE AND NOT IOS)
TARGET_LINK_LIBRARIES(qgis_core qgis_native)
ENDIF (APPLE AND NOT IOS)
IF (QT_MOBILITY_LOCATION_FOUND) IF (QT_MOBILITY_LOCATION_FOUND)
TARGET_LINK_LIBRARIES(qgis_core ${QT_MOBILITY_LOCATION_LIBRARY}) TARGET_LINK_LIBRARIES(qgis_core ${QT_MOBILITY_LOCATION_LIBRARY})
ENDIF (QT_MOBILITY_LOCATION_FOUND) ENDIF (QT_MOBILITY_LOCATION_FOUND)

1
src/core/qgsexpressioncontext.cpp
View File

@ -33,6 +33,7 @@
#include "qgslayoutpagecollection.h" #include "qgslayoutpagecollection.h"
#include "qgslayoutreportcontext.h" #include "qgslayoutreportcontext.h"
#include "qgsexpressionutils.h" #include "qgsexpressionutils.h"
#include "qgslayoutrendercontext.h"
#include <QSettings> #include <QSettings>
#include <QDir> #include <QDir>

2
src/providers/CMakeLists.txt
View File

@ -8,7 +8,9 @@ ADD_SUBDIRECTORY(wms)
ADD_SUBDIRECTORY(delimitedtext) ADD_SUBDIRECTORY(delimitedtext)
ADD_SUBDIRECTORY(gdal) ADD_SUBDIRECTORY(gdal)
ADD_SUBDIRECTORY(geonode) ADD_SUBDIRECTORY(geonode)
IF (NOT IOS)
ADD_SUBDIRECTORY(mssql) ADD_SUBDIRECTORY(mssql)
ENDIF(NOT IOS)
ADD_SUBDIRECTORY(ows) ADD_SUBDIRECTORY(ows)
ADD_SUBDIRECTORY(wcs) ADD_SUBDIRECTORY(wcs)
ADD_SUBDIRECTORY(gpx) ADD_SUBDIRECTORY(gpx)