@@ -183,9 +183,9 @@ ENDIF(${SIP_VERSION_STR} VERSION_GREATER 4.19.6)
183
183
FILE (GLOB_RECURSE sip_files_core core/*.sip core/*.sip.in )
184
184
SET (SIP_EXTRA_FILES_DEPEND ${sip_files_core} )
185
185
SET (SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR} /python/qgis.core.api )
186
- IF (${SIP_VERSION_STR} VERSION_GREATER_EQUAL 4.18 )
186
+ IF (( ${SIP_VERSION_STR} VERSION_EQUAL 4.18 ) OR ( ${SIP_VERSION_STR} VERSION_GREATER 4.18 ) )
187
187
SET (SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY} /_core.pyi )
188
- ENDIF (${SIP_VERSION_STR} VERSION_GREATER_EQUAL 4.18 )
188
+ ENDIF (( ${SIP_VERSION_STR} VERSION_EQUAL 4.18 ) OR ( ${SIP_VERSION_STR} VERSION_GREATER 4.18 ) )
189
189
GENERATE_SIP_PYTHON_MODULE_CODE (qgis._core core/core.sip "${sip_files_core} " cpp_files )
190
190
BUILD_SIP_PYTHON_MODULE (qgis._core core/core.sip ${cpp_files} "" qgis_core )
191
191
SET (SIP_CORE_CPP_FILES ${cpp_files} )
@@ -204,9 +204,9 @@ IF (WITH_GUI)
204
204
FILE (GLOB_RECURSE sip_files_gui gui/*.sip gui/*.sip.in )
205
205
SET (SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui} )
206
206
SET (SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR} /python/qgis.gui.api )
207
- IF (${SIP_VERSION_STR} VERSION_GREATER_EQUAL 4.18 )
207
+ IF (( ${SIP_VERSION_STR} VERSION_EQUAL 4.18 ) OR ( ${SIP_VERSION_STR} VERSION_GREATER 4.18 ) )
208
208
SET (SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY} /_gui.pyi )
209
- ENDIF (${SIP_VERSION_STR} VERSION_GREATER_EQUAL 4.18 )
209
+ ENDIF (( ${SIP_VERSION_STR} VERSION_EQUAL 4.18 ) OR ( ${SIP_VERSION_STR} VERSION_GREATER 4.18 ) )
210
210
IF (QSCI_SIP_DIR )
211
211
SET (SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR} )
212
212
ELSE (QSCI_SIP_DIR )
@@ -230,9 +230,9 @@ IF (WITH_SERVER AND WITH_SERVER_PLUGINS)
230
230
FILE (GLOB_RECURSE sip_files_server server/*.sip server/*.sip.in )
231
231
SET (SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_server} )
232
232
SET (SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR} /python/qgis.server.api )
233
- IF (${SIP_VERSION_STR} VERSION_GREATER_EQUAL 4.18 )
233
+ IF (( ${SIP_VERSION_STR} VERSION_EQUAL 4.18 ) OR ( ${SIP_VERSION_STR} VERSION_GREATER 4.18 ) )
234
234
SET (SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY} /_server.pyi )
235
- ENDIF (${SIP_VERSION_STR} VERSION_GREATER_EQUAL 4.18 )
235
+ ENDIF (( ${SIP_VERSION_STR} VERSION_EQUAL 4.18 ) OR ( ${SIP_VERSION_STR} VERSION_GREATER 4.18 ) )
236
236
GENERATE_SIP_PYTHON_MODULE_CODE (qgis._server server/server.sip "${sip_files_server} " cpp_files )
237
237
BUILD_SIP_PYTHON_MODULE (qgis._server server/server.sip ${cpp_files} "" qgis_core qgis_server )
238
238
ENDIF (WITH_SERVER AND WITH_SERVER_PLUGINS )
@@ -257,9 +257,9 @@ INCLUDE_DIRECTORIES(BEFORE
257
257
FILE (GLOB_RECURSE sip_files_analysis analysis/*.sip analysis/*.sip.in )
258
258
SET (SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis} )
259
259
SET (SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR} /python/qgis.analysis.api )
260
- IF (${SIP_VERSION_STR} VERSION_GREATER_EQUAL 4.18 )
260
+ IF (( ${SIP_VERSION_STR} VERSION_EQUAL 4.18 ) OR ( ${SIP_VERSION_STR} VERSION_GREATER 4.18 ) )
261
261
SET (SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY} /_analysis.pyi )
262
- ENDIF (${SIP_VERSION_STR} VERSION_GREATER_EQUAL 4.18 )
262
+ ENDIF (( ${SIP_VERSION_STR} VERSION_EQUAL 4.18 ) OR ( ${SIP_VERSION_STR} VERSION_GREATER 4.18 ) )
263
263
GENERATE_SIP_PYTHON_MODULE_CODE (qgis._analysis analysis/analysis.sip "${sip_files_analysis} " cpp_files )
264
264
BUILD_SIP_PYTHON_MODULE (qgis._analysis analysis/analysis.sip ${cpp_files} "" qgis_core qgis_analysis )
265
265
0 commit comments