View | Details | Raw Unified | Return to bug 25926
Collapse All | Expand All

(-)cmake-2.8.5.orig/Modules/FindPackageHandleStandardArgs.cmake (-1 / +1 lines)
Lines 211-217 Link Here
211
          SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
211
          SET(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
212
          SET(VERSION_OK FALSE)
212
          SET(VERSION_OK FALSE)
213
        ELSE ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
213
        ELSE ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
214
          SET(VERSION_MSG "(found suitable version \"${VERSION}\", required is \"${${_NAME}_FIND_VERSION}\")")
214
          SET(VERSION_MSG "(found suitable version \"${VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")")
215
        ENDIF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
215
        ENDIF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}")
216
      ENDIF(${_NAME}_FIND_VERSION_EXACT)
216
      ENDIF(${_NAME}_FIND_VERSION_EXACT)
217
217
(-)cmake-2.8.5.orig/Modules/FindQt3.cmake (-1 / +1 lines)
Lines 206-212 Link Here
206
  ENDIF (NOT req_qt_major_vers)
206
  ENDIF (NOT req_qt_major_vers)
207
207
208
  STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}")
208
  STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT_MIN_VERSION}")
209
  STRING(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}")
209
  STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" req_qt_minor_vers "${QT_MIN_VERSION}")
210
  STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}")
210
  STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT_MIN_VERSION}")
211
211
212
  # req = "6.5.4", qt = "3.2.1"
212
  # req = "6.5.4", qt = "3.2.1"
(-)cmake-2.8.5.orig/Modules/FindQt4.cmake (+5 lines)
Lines 1130-1135 Link Here
1130
#support old QT_MIN_VERSION if set, but not if version is supplied by find_package()
1130
#support old QT_MIN_VERSION if set, but not if version is supplied by find_package()
1131
IF(NOT Qt4_FIND_VERSION AND QT_MIN_VERSION)
1131
IF(NOT Qt4_FIND_VERSION AND QT_MIN_VERSION)
1132
  SET(Qt4_FIND_VERSION ${QT_MIN_VERSION})
1132
  SET(Qt4_FIND_VERSION ${QT_MIN_VERSION})
1133
  STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" Qt4_FIND_VERSION_MAJOR "${QT_MIN_VERSION}")
1134
  STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" Qt4_FIND_VERSION_MINOR "${QT_MIN_VERSION}")
1135
  STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" Qt4_FIND_VERSION_PATCH "${QT_MIN_VERSION}")
1136
  SET(Qt4_FIND_VERSION_TWEAK "0")
1137
  SET(Qt4_FIND_VERSION_COUNT "3")
1133
ENDIF(NOT Qt4_FIND_VERSION AND QT_MIN_VERSION)
1138
ENDIF(NOT Qt4_FIND_VERSION AND QT_MIN_VERSION)
1134
1139
1135
IF( Qt4_FIND_COMPONENTS )
1140
IF( Qt4_FIND_COMPONENTS )

Return to bug 25926