diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-25 16:09:14 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-04-25 16:09:14 (GMT) |
| commit | e6d820ed49dfa56f7ed7df2fa09db7828a57fcae (patch) | |
| tree | 4ca2eae5e6bd7d1ed5ab687d91eb3302d188c76d /Modules/FindQt3.cmake | |
| parent | 661298475fab40fb67e81debced4a315771ed5ae (diff) | |
| download | CMake-e6d820ed49dfa56f7ed7df2fa09db7828a57fcae.zip CMake-e6d820ed49dfa56f7ed7df2fa09db7828a57fcae.tar.gz CMake-e6d820ed49dfa56f7ed7df2fa09db7828a57fcae.tar.bz2 | |
ENH: move from main tree to 2.4 branch
Diffstat (limited to 'Modules/FindQt3.cmake')
| -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) |