diff options
author | David Cole <david.cole@kitware.com> | 2010-11-16 19:46:04 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-11-16 19:46:04 (GMT) |
commit | caf680c4d7115fb5e6e16f4a738a7f49346b5de3 (patch) | |
tree | 7c107743ead8c4f6ab484c2f5e89870343119a62 /Modules | |
parent | f4f3c9ff493e41d10f31d8b143e396516311f6c2 (diff) | |
parent | a39ee97c6cfe19e2170e0e5eccbfb8b1be3b1f48 (diff) | |
download | CMake-caf680c4d7115fb5e6e16f4a738a7f49346b5de3.zip CMake-caf680c4d7115fb5e6e16f4a738a7f49346b5de3.tar.gz CMake-caf680c4d7115fb5e6e16f4a738a7f49346b5de3.tar.bz2 |
Merge topic 'FixFindQt3REQUIRED'
a39ee97 Fix #11421: FindQt3.cmake doesn't honor the REQUIRED keyword
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/FindQt3.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake index 3606a5f..1319de2 100644 --- a/Modules/FindQt3.cmake +++ b/Modules/FindQt3.cmake @@ -242,9 +242,9 @@ IF (QT_MIN_VERSION) ENDIF (QT_MIN_VERSION) # if the include a library are found then we have it -IF(QT_INCLUDE_DIR AND QT_QT_LIBRARY) - SET( QT_FOUND "YES" ) -ENDIF(QT_INCLUDE_DIR AND QT_QT_LIBRARY) +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt3 DEFAULT_MSG QT_QT_LIBRARY QT_INCLUDE_DIR QT_MOC_EXECUTABLE) +SET(QT_FOUND ${QT3_FOUND} ) IF(QT_FOUND) SET( QT_LIBRARIES ${QT_LIBRARIES} ${QT_QT_LIBRARY} ) |