Merge topic 'FixFindQt3REQUIRED'
a39ee97
Fix #11421: FindQt3.cmake doesn't honor the REQUIRED keyword
This commit is contained in:
commit
caf680c4d7
|
@ -242,9 +242,9 @@ IF (QT_MIN_VERSION)
|
||||||
ENDIF (QT_MIN_VERSION)
|
ENDIF (QT_MIN_VERSION)
|
||||||
|
|
||||||
# if the include a library are found then we have it
|
# if the include a library are found then we have it
|
||||||
IF(QT_INCLUDE_DIR AND QT_QT_LIBRARY)
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
SET( QT_FOUND "YES" )
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt3 DEFAULT_MSG QT_QT_LIBRARY QT_INCLUDE_DIR QT_MOC_EXECUTABLE)
|
||||||
ENDIF(QT_INCLUDE_DIR AND QT_QT_LIBRARY)
|
SET(QT_FOUND ${QT3_FOUND} )
|
||||||
|
|
||||||
IF(QT_FOUND)
|
IF(QT_FOUND)
|
||||||
SET( QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT_LIBRARY} )
|
SET( QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT_LIBRARY} )
|
||||||
|
|
Loading…
Reference in New Issue