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

Merge topic 'set-Qt4_FOUND'

Browse Source 
28d14f9 FindQt4: Set the Qt4_FOUND variable if Qt4 is found
This commit is contained in:
Brad King 2013-03-18 09:41:41 -04:00 committed by CMake Topic Stage
commit bb260f0927
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindQt4.cmake
View File

@ -187,7 +187,8 @@
#
# Below is a detailed list of variables that FindQt4.cmake sets.
# QT_FOUND If false, don't try to use Qt.
# QT4_FOUND If false, don't try to use Qt 4.
# Qt4_FOUND If false, don't try to use Qt 4.
# QT4_FOUND If false, don't try to use Qt 4. This variable is for compatibility only.
#
# QT_VERSION_MAJOR The major version of Qt found.
# QT_VERSION_MINOR The minor version of Qt found.
@ -1358,7 +1359,7 @@ if (NOT QT_VERSION_MAJOR EQUAL 4)
endif()
endif()
else()
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4 FOUND_VAR Qt4_FOUND
REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS}
VERSION_VAR QTVERSION
)
@ -1373,5 +1374,6 @@ endif()
set (QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
set (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
set( QT_QT_LIBRARY "")
set(QT_FOUND ${QT4_FOUND})
set(QT4_FOUND ${Qt4_FOUND})
set(QT_FOUND ${Qt4_FOUND})