kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Stephen Kelly 2013-05-15 16:17:41 +02:00 committed by Brad King
parent 5dd8c01429
commit 444e752294
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/FindQt4.cmake
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}\" " message(WARNING "${QT_QMAKE_EXECUTABLE} reported QT_INSTALL_LIBS as \"${QT_LIBRARY_DIR_TMP}\" "
"but QtCore could not be found there. " "but QtCore could not be found there. "
"Qt is NOT installed correctly for the target build environment.") "Qt is NOT installed correctly for the target build environment.")
set(Qt4_FOUND FALSE)
if(Qt4_FIND_REQUIRED) if(Qt4_FIND_REQUIRED)
message( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.") message( FATAL_ERROR "Could NOT find QtCore. Check ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log for more details.")
else()
return()
endif() endif()
endif() endif()