From 3eb75cdc764701928355f05a2fdb2fc70ddad86c Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 23 Apr 2006 07:23:57 -0400 Subject: [PATCH] BUG: fix QT_MIN_VERSION handling, it didn't work anymore (qt_version_str vs. qt_version_str_lib) Alex --- Modules/FindQt3.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake index 41facd41b..93034f0ff 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)