Merge topic 'fix-build-without-qt4-with-qt5'

444e752 FindQt4: Fix QUIET failure with Qt 5 but not Qt 4
This commit is contained in:
Brad King 2013-05-21 15:13:21 -04:00 committed by CMake Topic Stage
commit 484112d045
1 changed files with 3 additions and 0 deletions

View File

@ -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()