From 444e752294166674af884c02202da518d3794fa9 Mon Sep 17 00:00:00 2001 From: Stephen Kelly <steveire@gmail.com> Date: Wed, 15 May 2013 16:17:41 +0200 Subject: 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. --- Modules/FindQt4.cmake | 3 +++ 1 file changed, 3 insertions(+) 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() -- cgit v0.12