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

Merge topic 'abort-findqt4-on-qt5' 

37a28ff Fix the number variable comparison when Qt is not found.
1dfe15c Abort FindQt4.cmake if Qt 5 is found.
This commit is contained in:
David Cole 2012-05-08 14:32:53 -04:00 committed by CMake Topic Stage
parent fb337c66b8 37a28ffa36
commit 105dfc38be
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/FindQt4.cmake
View File

@ -1169,10 +1169,22 @@ ELSE( Qt4_FIND_COMPONENTS )
ENDIF( Qt4_FIND_COMPONENTS ) ENDIF( Qt4_FIND_COMPONENTS )
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4 if (QT_VERSION_MAJOR GREATER 4)
SET(VERSION_MSG "Found unsuitable Qt version \"${QTVERSION}\" from ${QT_QMAKE_EXECUTABLE}")
SET(QT4_FOUND FALSE)
IF(Qt4_FIND_REQUIRED)
MESSAGE( FATAL_ERROR "${VERSION_MSG}, this code requires Qt 4.x")
ELSE(Qt4_FIND_REQUIRED)
IF(NOT Qt4_FIND_QUIETLY)
MESSAGE( STATUS "${VERSION_MSG}")
ENDIF(NOT Qt4_FIND_QUIETLY)
ENDIF(Qt4_FIND_REQUIRED)
else()
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4
REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS} REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS}
VERSION_VAR QTVERSION VERSION_VAR QTVERSION
) )
endif()
####################################### #######################################
# #