File tree Expand file tree Collapse file tree 7 files changed +24
-31
lines changed Expand file tree Collapse file tree 7 files changed +24
-31
lines changed Original file line number Diff line number Diff line change @@ -69,6 +69,20 @@ IF(NOT MSVC)
69
69
endif (USE_CCACHE )
70
70
endif (NOT MSVC )
71
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
+
72
86
# in generated makefiles use relative paths so the project dir is moveable
73
87
# Note commented out since it cause problems but it would be nice to resolve these and enable
74
88
#
Original file line number Diff line number Diff line change 1
- IF (NOT IOS )
2
- ADD_SUBDIRECTORY (native )
3
- ENDIF (NOT IOS )
4
-
1
+ ADD_SUBDIRECTORY (native )
5
2
ADD_SUBDIRECTORY (core )
6
3
7
4
IF (NOT IOS )
Original file line number Diff line number Diff line change @@ -1271,14 +1271,8 @@ ADD_DEFINITIONS(-DTEST_DATA_DIR="${TEST_DATA_DIR}")
1271
1271
1272
1272
#############################################################
1273
1273
# qgis_core library
1274
- IF (IOS )
1275
- SET (LIBRARY_TYPE STATIC )
1276
- ELSE (IOS )
1277
- SET (LIBRARY_TYPE SHARED )
1278
- ENDIF (IOS )
1279
1274
ADD_LIBRARY (qgis_core ${LIBRARY_TYPE} ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${QGIS_CORE_HDRS} ${QGIS_CORE_MOC_HDRS} )
1280
1275
1281
-
1282
1276
GENERATE_EXPORT_HEADER (
1283
1277
qgis_core
1284
1278
BASE_NAME CORE
Original file line number Diff line number Diff line change @@ -46,16 +46,9 @@ class CORE_EXPORT QgsMapRendererTask : public QgsTask
46
46
// ! \brief Error type
47
47
enum ErrorType
48
48
{
49
- // ! Image allocation failure
50
- ImageAllocationFail = 1 ,
51
- // ! Image save failure
52
- ImageSaveFail,
53
-
54
- /* *
55
- * Format is unsupported on the platform
56
- * \since QGIS 3.4
57
- */
58
- ImageUnsupportedFormat
49
+ ImageAllocationFail = 1 , // !< Image allocation failure
50
+ ImageSaveFail, // !< Image save failure
51
+ ImageUnsupportedFormat // !< Format is unsupported on the platform \since QGIS 3.4
59
52
};
60
53
61
54
/* *
Original file line number Diff line number Diff line change 1
1
#############################################################
2
2
# locate native libs
3
3
4
+ IF (IOS )
5
+ # No native library for IOS
6
+ RETURN ()
7
+ ENDIF (IOS )
8
+
9
+
4
10
SET (NATIVE_LINK_LIBS )
5
11
6
12
IF (UNIX AND NOT APPLE AND NOT ANDROID )
Original file line number Diff line number Diff line change @@ -99,11 +99,6 @@ ELSE(MSVC)
99
99
SET_SOURCE_FILES_PROPERTIES (${QGIS_QUICK_GUI_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )
100
100
ENDIF (MSVC )
101
101
102
- IF (IOS )
103
- SET (LIBRARY_TYPE STATIC )
104
- ELSE (IOS )
105
- SET (LIBRARY_TYPE SHARED )
106
- ENDIF (IOS )
107
102
ADD_LIBRARY (qgis_quick ${LIBRARY_TYPE}
108
103
${QGIS_QUICK_GUI_IMAGE_RCC_SRCS}
109
104
${QGIS_QUICK_GUI_SRC}
Original file line number Diff line number Diff line change @@ -30,7 +30,6 @@ ELSE (IOS)
30
30
SET (QGIS_QUICK_PLUGIN_RESOURCES ${QGIS_QUICK_PLUGIN_RESOURCES} qmldir )
31
31
ENDIF (IOS )
32
32
33
-
34
33
INCLUDE_DIRECTORIES (
35
34
${CMAKE_CURRENT_SOURCE_DIR}
36
35
${CMAKE_CURRENT_BINARY_DIR}
@@ -85,11 +84,6 @@ ENDIF(MSVC)
85
84
86
85
SET (QGIS_QUICK_PLUGIN_RUNTIME_DIR ${QGIS_OUTPUT_DIRECTORY} /${QGIS_QML_SUBDIR}/QgsQuick )
87
86
88
- IF (IOS )
89
- SET (LIBRARY_TYPE STATIC )
90
- ELSE (IOS )
91
- SET (LIBRARY_TYPE MODULE )
92
- ENDIF (IOS )
93
87
ADD_LIBRARY (qgis_quick_plugin ${LIBRARY_TYPE}
94
88
${QGIS_QUICK_PLUGIN_SRC}
95
89
${QGIS_QUICK_PLUGIN_MOC_HDRS}
You can’t perform that action at this time.
0 commit comments