diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-05-15 14:17:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-05-21 18:52:26 (GMT) |
| commit | 444e752294166674af884c02202da518d3794fa9 (patch) | |
| tree | 11a5ae150e07d20573cfe88fa2d3f6c83230a858 /Modules/FindQt4.cmake | |
| parent | 5dd8c01429da90a7417b72f17e784cc98f70f57c (diff) | |
| download | CMake-444e752294166674af884c02202da518d3794fa9.zip CMake-444e752294166674af884c02202da518d3794fa9.tar.gz CMake-444e752294166674af884c02202da518d3794fa9.tar.bz2 | |
FindQt4: Fix QUIET failure with Qt 5 but not Qt 4
The call
find_package(Qt4 QUIET)
should be non-FATAL in that case. This fixes #14142.
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 21e8e91..85686a9 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -657,8 +657,11 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) message(WARNING "${QT_QMAKE_EXECUTABLE} reported QT_INSTALL_LIBS as \"${QT_LIBRARY_DIR_TMP}\" " "but QtCore could not be found there. " "Qt is NOT installed correctly for the target build environment.") + set(Qt4_FOUND FALSE) if(Qt4_FIND_REQUIRED) message( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.") + else() + return() endif() endif() |