@@ -16,6 +16,7 @@ SET(CPACK_PACKAGE_VERSION_PATCH "0")
16
16
SET (COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR} .${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} )
17
17
SET (RELEASE_NAME "Master" )
18
18
PROJECT (qgis VERSION ${COMPLETE_VERSION} )
19
+
19
20
IF (APPLE )
20
21
SET (QGIS_APP_NAME "QGIS" )
21
22
ELSE (APPLE )
@@ -68,6 +69,20 @@ IF(NOT MSVC)
68
69
endif (USE_CCACHE )
69
70
endif (NOT MSVC )
70
71
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
+
71
86
# in generated makefiles use relative paths so the project dir is moveable
72
87
# Note commented out since it cause problems but it would be nice to resolve these and enable
73
88
#
@@ -316,6 +331,15 @@ IF(WITH_CORE)
316
331
#############################################################
317
332
# search for Qt5
318
333
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
+
319
343
FIND_PACKAGE (Qt5Core QUIET )
320
344
FIND_PACKAGE (Qt5Gui REQUIRED )
321
345
FIND_PACKAGE (Qt5Widgets REQUIRED )
@@ -324,7 +348,6 @@ IF(WITH_CORE)
324
348
FIND_PACKAGE (Qt5Svg REQUIRED )
325
349
FIND_PACKAGE (Qt5Concurrent REQUIRED )
326
350
FIND_PACKAGE (Qt5PrintSupport REQUIRED )
327
- FIND_PACKAGE (Qt5SerialPort REQUIRED )
328
351
FIND_PACKAGE (Qt5Positioning )
329
352
IF (WITH_QTWEBKIT )
330
353
FIND_PACKAGE (Qt5WebKit REQUIRED )
@@ -352,7 +375,7 @@ IF(WITH_CORE)
352
375
IF (${CMAKE_SYSTEM_NAME} MATCHES "Android" )
353
376
FIND_PACKAGE (Qt5AndroidExtras )
354
377
ELSE (${CMAKE_SYSTEM_NAME} MATCHES "Android" )
355
- FIND_PACKAGE (QtQmlTools REQUIRED )
378
+ FIND_PACKAGE (QtQmlTools )
356
379
ENDIF (${CMAKE_SYSTEM_NAME} MATCHES "Android" )
357
380
358
381
# following variable is used in qgsconfig.h
@@ -412,7 +435,6 @@ SET(QML_IMPORT_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" CACHE PATH "QML director
412
435
SET (ENABLE_TESTS TRUE CACHE BOOL "Build unit tests?" )
413
436
IF (ENABLE_TESTS )
414
437
SET ( QT_USE_QTTEST TRUE )
415
- ADD_DEFINITIONS (-DENABLE_TESTS )
416
438
ENABLE_TESTING ()
417
439
# Adds some testing specific build targets e.g. make Experimental
418
440
INCLUDE (Dart )
0 commit comments