Skip to content

Commit c292e69

Browse files
lbartolettilbartoletti
authoredNov 15, 2018
Merge branch 'master' into extendMapTool
2 parents 574a57f + 767e9a5 commit c292e69

File tree

92 files changed

+2028
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+2028
-174
lines changed
 

‎CMakeLists.txt

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ SET(CPACK_PACKAGE_VERSION_PATCH "0")
1616
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
1717
SET(RELEASE_NAME "Master")
1818
PROJECT(qgis VERSION ${COMPLETE_VERSION})
19+
1920
IF (APPLE)
2021
SET(QGIS_APP_NAME "QGIS")
2122
ELSE (APPLE)
@@ -68,6 +69,20 @@ IF(NOT MSVC)
6869
endif(USE_CCACHE)
6970
endif(NOT MSVC)
7071

72+
IF (IOS)
73+
SET (DEFAULT_FORCE_STATIC_LIBS TRUE)
74+
ELSE (IOS)
75+
SET (DEFAULT_FORCE_STATIC_LIBS FALSE)
76+
ENDIF (IOS)
77+
SET (FORCE_STATIC_LIBS ${DEFAULT_FORCE_STATIC_LIBS} CACHE BOOL "Determines whether libraries should be static only")
78+
MARK_AS_ADVANCED(FORCE_STATIC_LIBS)
79+
80+
IF(FORCE_STATIC_LIBS)
81+
SET(LIBRARY_TYPE STATIC)
82+
ELSE (FORCE_STATIC_LIBS)
83+
SET(LIBRARY_TYPE SHARED)
84+
ENDIF (FORCE_STATIC_LIBS)
85+
7186
# in generated makefiles use relative paths so the project dir is moveable
7287
# Note commented out since it cause problems but it would be nice to resolve these and enable
7388
#
@@ -316,6 +331,15 @@ IF(WITH_CORE)
316331
#############################################################
317332
# search for Qt5
318333
SET(QT_MIN_VERSION 5.9.0)
334+
335+
# Use Qt5SerialPort optionally for GPS
336+
SET (WITH_QT5SERIALPORT TRUE CACHE BOOL "Determines whether Qt5SerialPort should be tried for GPS positioning")
337+
IF (WITH_QT5SERIALPORT)
338+
FIND_PACKAGE(Qt5SerialPort REQUIRED)
339+
# following variable is used in qgsconfig.h
340+
SET (HAVE_QT5SERIALPORT TRUE)
341+
ENDIF(WITH_QT5SERIALPORT)
342+
319343
FIND_PACKAGE(Qt5Core QUIET)
320344
FIND_PACKAGE(Qt5Gui REQUIRED)
321345
FIND_PACKAGE(Qt5Widgets REQUIRED)
@@ -324,7 +348,6 @@ IF(WITH_CORE)
324348
FIND_PACKAGE(Qt5Svg REQUIRED)
325349
FIND_PACKAGE(Qt5Concurrent REQUIRED)
326350
FIND_PACKAGE(Qt5PrintSupport REQUIRED)
327-
FIND_PACKAGE(Qt5SerialPort REQUIRED)
328351
FIND_PACKAGE(Qt5Positioning)
329352
IF (WITH_QTWEBKIT)
330353
FIND_PACKAGE(Qt5WebKit REQUIRED)
@@ -352,7 +375,7 @@ IF(WITH_CORE)
352375
IF(${CMAKE_SYSTEM_NAME} MATCHES "Android")
353376
FIND_PACKAGE(Qt5AndroidExtras)
354377
ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Android")
355-
FIND_PACKAGE(QtQmlTools REQUIRED)
378+
FIND_PACKAGE(QtQmlTools)
356379
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Android")
357380

358381
# following variable is used in qgsconfig.h
@@ -412,7 +435,6 @@ SET(QML_IMPORT_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" CACHE PATH "QML director
412435
SET (ENABLE_TESTS TRUE CACHE BOOL "Build unit tests?")
413436
IF (ENABLE_TESTS)
414437
SET( QT_USE_QTTEST TRUE )
415-
ADD_DEFINITIONS(-DENABLE_TESTS)
416438
ENABLE_TESTING()
417439
# Adds some testing specific build targets e.g. make Experimental
418440
INCLUDE(Dart)

‎cmake/FindSpatiaLite.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ include(CheckLibraryExists)
2424

2525
# try to use sqlite framework on mac
2626
# want clean framework path, not unix compatibility path
27-
IF (APPLE)
27+
IF (APPLE AND NOT IOS)
2828
IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
2929
OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
3030
OR NOT CMAKE_FIND_FRAMEWORK)
@@ -39,7 +39,7 @@ IF (APPLE)
3939
ENDIF (SPATIALITE_INCLUDE_DIR)
4040
SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
4141
ENDIF ()
42-
ENDIF (APPLE)
42+
ENDIF (APPLE AND NOT IOS)
4343

4444
FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h
4545
/usr/include

0 commit comments

Comments
 (0)