Skip to content
Permalink
Browse files

Use SIP_INCLUDE_DIR and SIP_MODULE_DIR only with SIP v4

  • Loading branch information
mitya57 committed Jul 21, 2020
1 parent 33b58dd commit d0c4e0de9d3f771d6ac6b79c4105b911ea35cb0d
Showing with 10 additions and 2 deletions.
  1. +4 −2 cmake/FindSIP.cmake
  2. +6 −0 python/CMakeLists.txt
@@ -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)

@@ -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}

0 comments on commit d0c4e0d

Please sign in to comment.
You can’t perform that action at this time.