Skip to content
Permalink
Browse files
fix #2720
git-svn-id: http://svn.osgeo.org/qgis/trunk@13488 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed May 15, 2010
1 parent fd89513 commit 2b753a2ec6a3fb856e3294231b222e2c860ea5ca
Showing with 5 additions and 11 deletions.
  1. +3 −9 cmake/FindPyQt4.cmake
  2. +2 −2 python/CMakeLists.txt
@@ -22,10 +22,10 @@
#
# PYQT4_SIP_FLAGS - The SIP flags used to build PyQt.

IF(EXISTS PYQT4_VERSION_STR)
IF(EXISTS PYQT4_VERSION)
# Already in cache, be silent
SET(PYQT4_FOUND TRUE)
ELSE(EXISTS PYQT4_VERSION_STR)
ELSE(EXISTS PYQT4_VERSION)

FIND_FILE(_find_pyqt_py FindPyQt.py PATHS ${CMAKE_MODULE_PATH})

@@ -50,10 +50,4 @@ ELSE(EXISTS PYQT4_VERSION_STR)
ENDIF(PYQT4_FIND_REQUIRED)
ENDIF(PYQT4_FOUND)

ENDIF(EXISTS PYQT4_VERSION_STR)

STRING(REGEX REPLACE "^([0-9]*)\\.[0-9]*\\.[0-9]*$" "\\1" PYQT4_MAJOR_VERSION ${PYQT4_VERSION_STR})
STRING(REGEX REPLACE "^[0-9]*\\.([0-9]*)\\.[0-9]*$" "\\1" PYQT4_MINOR_VERSION ${PYQT4_VERSION_STR})
STRING(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.([0-9]*)$" "\\1" PYQT4_PATCH_VERSION ${PYQT4_VERSION_STR})
MATH( EXPR PYQT4_NUM_VERSION "${PYQT4_MAJOR_VERSION}*10000 + ${PYQT4_MINOR_VERSION}*100 + ${PYQT4_PATCH_VERSION}")

ENDIF(EXISTS PYQT4_VERSION)
@@ -35,9 +35,9 @@ IF(MSVC)
ADD_DEFINITIONS(-DNOMINMAX)
ENDIF(MSVC)

IF(${PYQT4_NUM_VERSION} LESS 40600)
IF(PYQT4_VERSION_TAG LESS 263680) # 0x040600
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
ENDIF(${PYQT4_NUM_VERSION} LESS 40600)
ENDIF(PYQT4_VERSION_TAG LESS 263680)

# core module
FILE(GLOB sip_files_core core/*.sip)

0 comments on commit 2b753a2

Please sign in to comment.