kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: These regular expressions were wrong because \\t does not match tab. Also, this fix prevents whole file to be dumped to the cache

This commit is contained in:
Andy Cedilnik 2004-07-13 10:03:32 -04:00
parent 0e0eec1162
commit b0d86400d9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/FindQt.cmake
View File

@ -33,10 +33,12 @@ IF(QT_INCLUDE_DIR)
#extract the version string from qglobal.h #extract the version string from qglobal.h
FILE(READ ${QT_INCLUDE_DIR}/qglobal.h QGLOBAL_H) FILE(READ ${QT_INCLUDE_DIR}/qglobal.h QGLOBAL_H)
STRING(REGEX REPLACE ".*#define[\\t\\ ]+QT_VERSION_STR[\\t\\ ]+\"([0-9]+\\.[0-9]+\\.[0-9]+)\".*" "\\1" qt_version_str "${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}")
# Under windows the qt library (MSVC) has the format qt-mtXYZ where XYZ is the # 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 # version X.Y.Z, so we need to remove the dots from version
STRING(REGEX REPLACE "\\." "" qt_version_str_lib "${qt_version_str}") STRING(REGEX REPLACE "\\." "" qt_version_str_lib "${QGLOBAL_H}")
ELSE(QT_INCLUDE_DIR) ELSE(QT_INCLUDE_DIR)
MESSAGE(STATUS "Did not find Qt headers (qglobal.h)") MESSAGE(STATUS "Did not find Qt headers (qglobal.h)")
ENDIF(QT_INCLUDE_DIR) ENDIF(QT_INCLUDE_DIR)