diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-04-23 11:23:57 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-04-23 11:23:57 (GMT) |
| commit | 3eb75cdc764701928355f05a2fdb2fc70ddad86c (patch) | |
| tree | 5ad603c5bb46d12b66d15bbf592d12eacc89eaff | |
| parent | b3d2055febd2367ac593ee116302bdcef07a6458 (diff) | |
| download | CMake-3eb75cdc764701928355f05a2fdb2fc70ddad86c.zip CMake-3eb75cdc764701928355f05a2fdb2fc70ddad86c.tar.gz CMake-3eb75cdc764701928355f05a2fdb2fc70ddad86c.tar.bz2 | |
BUG: fix QT_MIN_VERSION handling, it didn't work anymore (qt_version_str vs.
qt_version_str_lib)
Alex
| -rw-r--r-- | Modules/FindQt3.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake index 41facd4..93034f0 100644 --- a/Modules/FindQt3.cmake +++ b/Modules/FindQt3.cmake @@ -48,11 +48,11 @@ IF(QT_INCLUDE_DIR) #extract the version string from qglobal.h FILE(READ ${QT_INCLUDE_DIR}/qglobal.h QGLOBAL_H) STRING(REGEX MATCH "#define[\t ]+QT_VERSION_STR[\t ]+\"([0-9]+.[0-9]+.[0-9]+)\"" QGLOBAL_H "${QGLOBAL_H}") - STRING(REGEX REPLACE ".*\"([0-9]+.[0-9]+.[0-9]+)\".*" "\\1" QGLOBAL_H "${QGLOBAL_H}") + STRING(REGEX REPLACE ".*\"([0-9]+.[0-9]+.[0-9]+)\".*" "\\1" qt_version_str "${QGLOBAL_H}") # Under windows the qt library (MSVC) has the format qt-mtXYZ where XYZ is the # version X.Y.Z, so we need to remove the dots from version - STRING(REGEX REPLACE "\\." "" qt_version_str_lib "${QGLOBAL_H}") + STRING(REGEX REPLACE "\\." "" qt_version_str_lib "${qt_version_str}") ELSE(QT_INCLUDE_DIR) ENDIF(QT_INCLUDE_DIR) |