diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-07-18 12:11:23 +0300 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-07-18 12:11:23 +0300 |
| commit | b4d16dbee4cf525f293b6de7f0cd3e5ee081f660 (patch) | |
| tree | 856736b640e179b45e0e04a6e79b480afd3843cb /attic | |
| parent | 0912b2468881286b508915b17d204f1c17fc93dd (diff) | |
| download | extra-cmake-modules-b4d16dbee4cf525f293b6de7f0cd3e5ee081f660.tar.gz extra-cmake-modules-b4d16dbee4cf525f293b6de7f0cd3e5ee081f660.tar.bz2 | |
FindPyQt4: Finish syncing with the kdelibs version.
The version committed in 0912b24 is slightly different from the one in
kdelibs -- besides a few differences in the comments, there is an IF()
check that was always evaluating to false.
Diffstat (limited to 'attic')
| -rw-r--r-- | attic/modules/FindPyQt4.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/attic/modules/FindPyQt4.cmake b/attic/modules/FindPyQt4.cmake index c0cb108e..b3fe28c7 100644 --- a/attic/modules/FindPyQt4.cmake +++ b/attic/modules/FindPyQt4.cmake @@ -13,11 +13,11 @@ # users: # # PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number -# suitable for comparision as a string +# suitable for comparison as a string # # PYQT4_VERSION_STR - The version of PyQt4 as a human readable string. # -# PYQT4_VERSION_TAG - The PyQt version tag using by PyQt's sip files. +# PYQT4_VERSION_TAG - The Qt4 version tag used by PyQt's sip files. # # PYQT4_SIP_DIR - The directory holding the PyQt4 .sip files. This can be unset # if PyQt4 was built using its new build system and pyqtconfig.py is not @@ -50,12 +50,12 @@ ELSE(EXISTS PYQT4_VERSION) STRING(REGEX MATCH ".*\npyqt_sip_flags:([^\n]+).*$" _dummy ${pyqt_config}) SET(PYQT4_SIP_FLAGS "${CMAKE_MATCH_1}" CACHE STRING "The SIP flags used to build PyQt4") - IF(NOT IS_DIRECTORY PYQT4_SIP_DIR) + IF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") MESSAGE(WARNING "The base directory where PyQt4's SIP files are installed could not be determined. This usually means PyQt4 was built with its new build system and pyqtconfig.py is not present.\n" "Please set the PYQT4_SIP_DIR variable manually.") - ELSE(NOT PYQT4_SIP_DIR) + ELSE(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") SET(PYQT4_FOUND TRUE) - ENDIF(NOT PYQT4_SIP_DIR) + ENDIF(NOT IS_DIRECTORY "${PYQT4_SIP_DIR}") ENDIF(pyqt_config) IF(PYQT4_FOUND) |