summaryrefslogtreecommitdiffstats
path: root/Modules/FindQt4.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-05-21 19:13:21 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-05-21 19:13:21 (GMT)
commit484112d045a2b22b1d336f1d1043f0f6e2a340f0 (patch)
treecacad908d92e7e9ed7ee7c8472fba214f69efbc4 /Modules/FindQt4.cmake
parent52f9b2e803caeb9f27e690bd8f4d96ff467517ab (diff)
parent444e752294166674af884c02202da518d3794fa9 (diff)
downloadCMake-484112d045a2b22b1d336f1d1043f0f6e2a340f0.zip
CMake-484112d045a2b22b1d336f1d1043f0f6e2a340f0.tar.gz
CMake-484112d045a2b22b1d336f1d1043f0f6e2a340f0.tar.bz2
Merge topic 'fix-build-without-qt4-with-qt5'
444e752 FindQt4: Fix QUIET failure with Qt 5 but not Qt 4
Diffstat (limited to 'Modules/FindQt4.cmake')
-rw-r--r--Modules/FindQt4.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 96764fd..68b37f3 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()