sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix #2720

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@13488 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2010-05-15 07:28:28 +00:00
parent fd89513c79
commit 2b753a2ec6
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/FindPyQt4.cmake
View File

@ -22,10 +22,10 @@
# #
# PYQT4_SIP_FLAGS - The SIP flags used to build PyQt. # PYQT4_SIP_FLAGS - The SIP flags used to build PyQt.
IF(EXISTS PYQT4_VERSION_STR) IF(EXISTS PYQT4_VERSION)
# Already in cache, be silent # Already in cache, be silent
SET(PYQT4_FOUND TRUE) SET(PYQT4_FOUND TRUE)
ELSE(EXISTS PYQT4_VERSION_STR) ELSE(EXISTS PYQT4_VERSION)
FIND_FILE(_find_pyqt_py FindPyQt.py PATHS ${CMAKE_MODULE_PATH}) 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_FIND_REQUIRED)
ENDIF(PYQT4_FOUND) ENDIF(PYQT4_FOUND)
ENDIF(EXISTS PYQT4_VERSION_STR) ENDIF(EXISTS PYQT4_VERSION)
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}")

4
python/CMakeLists.txt
View File

@ -35,9 +35,9 @@ IF(MSVC)
ADD_DEFINITIONS(-DNOMINMAX) ADD_DEFINITIONS(-DNOMINMAX)
ENDIF(MSVC) ENDIF(MSVC)
IF(${PYQT4_NUM_VERSION} LESS 40600) IF(PYQT4_VERSION_TAG LESS 263680) # 0x040600
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY) SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
ENDIF(${PYQT4_NUM_VERSION} LESS 40600) ENDIF(PYQT4_VERSION_TAG LESS 263680)
# core module # core module
FILE(GLOB sip_files_core core/*.sip) FILE(GLOB sip_files_core core/*.sip)