diff options
author | Kevin Kofler <kevin.kofler@chello.at> | 2010-12-10 17:21:14 +0000 |
---|---|---|
committer | Kevin Kofler <kevin.kofler@chello.at> | 2010-12-10 17:21:14 +0000 |
commit | 2de2587a96bcb23f261d0ab6464af021ced26c6c (patch) | |
tree | 2faf9813d635b3025685e112fb09af6963e7e667 /modules/MacroEnsureOutOfSourceBuild.cmake | |
parent | 32f81cf11322e683a2e25f9a7cc024cc0a8ec9f7 (diff) | |
download | extra-cmake-modules-2de2587a96bcb23f261d0ab6464af021ced26c6c.tar.gz extra-cmake-modules-2de2587a96bcb23f261d0ab6464af021ced26c6c.tar.bz2 |
FindQt4.cmake: Merge cfba5ef1 from upstream CMake:
http://cmake.org/gitweb?p=cmake.git;a=commit;h=cfba5ef111bf86e8820a4dff556b3a9edc1484cd
Fix regression in 2dae2f1 which added find of Qt imports dir.
2dae2f1 was previously merged by mart. This breaks finding qmake-qt4 when there's also a Qt 3 qmake around, the Qt 3 qmake is no longer recognized as bad. The above fix from upstream CMake fixes that.
CCMAIL: mart@kde.org
CCMAIL: neundorf@kde.org
CCMAIL: rdieter@math.unl.edu
svn path=/trunk/KDE/kdelibs/; revision=1205274
Diffstat (limited to 'modules/MacroEnsureOutOfSourceBuild.cmake')
0 files changed, 0 insertions, 0 deletions