diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-18 13:41:41 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-18 13:41:41 (GMT) |
| commit | bb260f09272ccb0c933b95791ad47495046ea0cb (patch) | |
| tree | dc4b7be979c82d31726dd5b6035009d534a64c5e /Modules | |
| parent | a402bc4d5a9722bec60535287e1328462fd0792e (diff) | |
| parent | 28d14f9f139cb6473cc819b69372b7eb9795bffd (diff) | |
| download | CMake-bb260f09272ccb0c933b95791ad47495046ea0cb.zip CMake-bb260f09272ccb0c933b95791ad47495046ea0cb.tar.gz CMake-bb260f09272ccb0c933b95791ad47495046ea0cb.tar.bz2 | |
Merge topic 'set-Qt4_FOUND'
28d14f9 FindQt4: Set the Qt4_FOUND variable if Qt4 is found
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 1dd2782..b62e902 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -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}) |