Use SIP_INCLUDE_DIR and SIP_MODULE_DIR only with SIP v4

qgis · Jul 21, 2020 · d0c4e0d · d0c4e0d
1 parent 33b58dd
commit d0c4e0d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cmake/FindSIP.cmake b/cmake/FindSIP.cmake
@@ -40,8 +40,10 @@ ELSE(SIP_VERSION)
     STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config})
     STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config})
     STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config})
-    STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config})
-    STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MODULE_DIR ${sip_config})
+    IF(${SIP_VERSION_STR} VERSION_LESS 5)
+      STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config})
+      STRING(REGEX REPLACE ".*\nsip_module_dir:([^\n]+).*$" "\\1" SIP_MODULE_DIR ${sip_config})
+    ENDIF(${SIP_VERSION_STR} VERSION_LESS 5)
     SET(SIP_FOUND TRUE)
   ENDIF(sip_config)
 

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -85,6 +85,12 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${SPATIALINDEX_INCLUDE_DIR}
 )
 
+IF (${SIP_VERSION_STR} VERSION_LESS 5)
+  INCLUDE_DIRECTORIES(SYSTEM
+    ${SIP_INCLUDE_DIR}
+  )
+ENDIF (${SIP_VERSION_STR} VERSION_LESS 5)
+
 IF (WITH_GUI)
   INCLUDE_DIRECTORIES(SYSTEM
     ${QSCINTILLA_INCLUDE_DIR}