diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2008-07-05 15:57:57 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2008-07-05 15:57:57 (GMT) |
| commit | 65ad7ba830588ab2646783b1a0df58abc0c38e37 (patch) | |
| tree | 8df7203f1877186c8037ec3f103faceb682732d6 | |
| parent | 70662e7f86e4d3818f1877134db0c1546e5cfe43 (diff) | |
| download | CMake-65ad7ba830588ab2646783b1a0df58abc0c38e37.zip CMake-65ad7ba830588ab2646783b1a0df58abc0c38e37.tar.gz CMake-65ad7ba830588ab2646783b1a0df58abc0c38e37.tar.bz2 | |
BUG: Watch for empty qconfig.pri files. Fixes #7287.
| -rw-r--r-- | Modules/FindQt4.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 91983ed..da8594c 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1343,9 +1343,9 @@ IF (QT4_QMAKE_FOUND) ####################################### IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents) - STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG ${_qconfig_FILE_contents}) - STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG ${_qconfig_FILE_contents}) - STRING(REGEX MATCH "EDITION[^\n]+" QT_EDITION ${_qconfig_FILE_contents}) + STRING(REGEX MATCH "QT_CONFIG[^\n]+" QT_QCONFIG "${_qconfig_FILE_contents}") + STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG "${_qconfig_FILE_contents}") + STRING(REGEX MATCH "EDITION[^\n]+" QT_EDITION "${_qconfig_FILE_contents}") ENDIF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") IF("${QT_EDITION}" MATCHES "DesktopLight") SET(QT_EDITION_DESKTOPLIGHT 1) |