Kaynağa Gözat

BUG: fix QT_MIN_VERSION handling, it didn't work anymore (qt_version_str vs.
qt_version_str_lib)

Alex

Alexander Neundorf 19 yıl önce
ebeveyn
işleme
3eb75cdc76
1 değiştirilmiş dosya ile 2 ekleme ve 2 silme
  1. 2 2
      Modules/FindQt3.cmake

+ 2 - 2
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)