Skip to content

Commit fc55d86

Browse files
authored
Merge pull request #7098 from alexbruy/fix-cmake
fix build with CMake < 3.7
2 parents 034c3f0 + 6cac1bd commit fc55d86

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

python/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ ENDIF(${SIP_VERSION_STR} VERSION_GREATER 4.19.6)
183183
FILE(GLOB_RECURSE sip_files_core core/*.sip core/*.sip.in)
184184
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
185185
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))
187187
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))
189189
GENERATE_SIP_PYTHON_MODULE_CODE(qgis._core core/core.sip "${sip_files_core}" cpp_files)
190190
BUILD_SIP_PYTHON_MODULE(qgis._core core/core.sip ${cpp_files} "" qgis_core)
191191
SET(SIP_CORE_CPP_FILES ${cpp_files})
@@ -204,9 +204,9 @@ IF (WITH_GUI)
204204
FILE(GLOB_RECURSE sip_files_gui gui/*.sip gui/*.sip.in)
205205
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
206206
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))
208208
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))
210210
IF(QSCI_SIP_DIR)
211211
SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR})
212212
ELSE(QSCI_SIP_DIR)
@@ -230,9 +230,9 @@ IF (WITH_SERVER AND WITH_SERVER_PLUGINS)
230230
FILE(GLOB_RECURSE sip_files_server server/*.sip server/*.sip.in)
231231
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_server})
232232
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))
234234
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))
236236
GENERATE_SIP_PYTHON_MODULE_CODE(qgis._server server/server.sip "${sip_files_server}" cpp_files)
237237
BUILD_SIP_PYTHON_MODULE(qgis._server server/server.sip ${cpp_files} "" qgis_core qgis_server)
238238
ENDIF (WITH_SERVER AND WITH_SERVER_PLUGINS)
@@ -257,9 +257,9 @@ INCLUDE_DIRECTORIES(BEFORE
257257
FILE(GLOB_RECURSE sip_files_analysis analysis/*.sip analysis/*.sip.in)
258258
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis})
259259
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))
261261
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))
263263
GENERATE_SIP_PYTHON_MODULE_CODE(qgis._analysis analysis/analysis.sip "${sip_files_analysis}" cpp_files)
264264
BUILD_SIP_PYTHON_MODULE(qgis._analysis analysis/analysis.sip ${cpp_files} "" qgis_core qgis_analysis)
265265

0 commit comments

Comments
 (0)