Attachment #5052 for bug #25926

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

Lines 211-217 Link Here

(-)cmake-2.8.5.orig/Modules/FindPackageHandleStandardArgs.cmake (-1 / +1 lines)
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

Lines 206-212 Link Here

(-)cmake-2.8.5.orig/Modules/FindQt3.cmake (-1 / +1 lines)
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"

Lines 1122-1128 Link Here

(-)cmake-2.8.5.orig/Modules/FindQt4.cmake (-1 / +6 lines)
1122		1122
1123	# set version variables	1123	# set version variables
1124	STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}")	1124	STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}")
1125	STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")	1125	STRING(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}")
1126	STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}")	1126	STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}")
1127		1127
1128	ENDIF(QT_QMAKE_EXECUTABLE AND QTVERSION)	1128	ENDIF(QT_QMAKE_EXECUTABLE AND QTVERSION)
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