qgis · Nov 15, 2018
diff --git a/‎CMakeLists.txt
Lines changed: 25 additions & 3 deletions b/‎CMakeLists.txt
Lines changed: 25 additions & 3 deletions
diff --git a/‎cmake/FindSpatiaLite.cmake
Lines changed: 2 additions & 2 deletions b/‎cmake/FindSpatiaLite.cmake
Lines changed: 2 additions & 2 deletions
@@ -16,6 +16,7 @@ SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Master")
 PROJECT(qgis VERSION ${COMPLETE_VERSION})
+
 IF (APPLE)
   SET(QGIS_APP_NAME "QGIS")
 ELSE (APPLE)
@@ -68,6 +69,20 @@ IF(NOT MSVC)
   endif(USE_CCACHE)
 endif(NOT MSVC)
 
+IF (IOS)
+    SET (DEFAULT_FORCE_STATIC_LIBS TRUE)
+ELSE (IOS)
+    SET (DEFAULT_FORCE_STATIC_LIBS FALSE)
+ENDIF (IOS)
+SET (FORCE_STATIC_LIBS ${DEFAULT_FORCE_STATIC_LIBS} CACHE BOOL "Determines whether libraries should be static only")
+MARK_AS_ADVANCED(FORCE_STATIC_LIBS)
+
+IF(FORCE_STATIC_LIBS)
+  SET(LIBRARY_TYPE STATIC)
+ELSE (FORCE_STATIC_LIBS)
+  SET(LIBRARY_TYPE SHARED)
+ENDIF (FORCE_STATIC_LIBS)
+
 # in generated makefiles use relative paths so the project dir is moveable
 # Note commented out since it cause problems but it would be nice to resolve these and enable
 #
@@ -316,6 +331,15 @@ IF(WITH_CORE)
   #############################################################
   # search for Qt5
   SET(QT_MIN_VERSION 5.9.0)
+
+  # Use Qt5SerialPort optionally for GPS
+  SET (WITH_QT5SERIALPORT TRUE CACHE BOOL "Determines whether Qt5SerialPort should be tried for GPS positioning")
+  IF (WITH_QT5SERIALPORT)
+      FIND_PACKAGE(Qt5SerialPort REQUIRED)
+      # following variable is used in qgsconfig.h
+      SET (HAVE_QT5SERIALPORT TRUE)
+  ENDIF(WITH_QT5SERIALPORT)
+
   FIND_PACKAGE(Qt5Core QUIET)
   FIND_PACKAGE(Qt5Gui REQUIRED)
   FIND_PACKAGE(Qt5Widgets REQUIRED)
@@ -324,7 +348,6 @@ IF(WITH_CORE)
   FIND_PACKAGE(Qt5Svg REQUIRED)
   FIND_PACKAGE(Qt5Concurrent REQUIRED)
   FIND_PACKAGE(Qt5PrintSupport REQUIRED)
-  FIND_PACKAGE(Qt5SerialPort REQUIRED)
   FIND_PACKAGE(Qt5Positioning)
   IF (WITH_QTWEBKIT)
     FIND_PACKAGE(Qt5WebKit REQUIRED)
@@ -352,7 +375,7 @@ IF(WITH_CORE)
     IF(${CMAKE_SYSTEM_NAME} MATCHES "Android")
         FIND_PACKAGE(Qt5AndroidExtras)
     ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Android")
-        FIND_PACKAGE(QtQmlTools REQUIRED)
+        FIND_PACKAGE(QtQmlTools)
     ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Android")
 
     # following variable is used in qgsconfig.h
@@ -412,7 +435,6 @@ SET(QML_IMPORT_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" CACHE PATH "QML director
 SET (ENABLE_TESTS TRUE CACHE BOOL "Build unit tests?")
 IF (ENABLE_TESTS)
 SET( QT_USE_QTTEST  TRUE )
-ADD_DEFINITIONS(-DENABLE_TESTS)
 ENABLE_TESTING()
 # Adds some testing specific build targets e.g. make Experimental
 INCLUDE(Dart)
 
@@ -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