summaryrefslogtreecommitdiffstats
path: root/Modules/FindQt3.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-10-05 14:25:36 (GMT)
committerBrad King <brad.king@kitware.com>2009-10-05 14:25:36 (GMT)
commita0e63cff1d776eb24d67db19ff838752ccfd6825 (patch)
treeb11791449ea94c4a3a4f54deb5b953b2b4944cd4 /Modules/FindQt3.cmake
parentb304186bc574bab921c2da6a66d3e1fcf2f515ee (diff)
downloadCMake-a0e63cff1d776eb24d67db19ff838752ccfd6825.zip
CMake-a0e63cff1d776eb24d67db19ff838752ccfd6825.tar.gz
CMake-a0e63cff1d776eb24d67db19ff838752ccfd6825.tar.bz2
FindQt3: Prefer (moc|uic)-qt3 names over (moc|uic)
On Debian moc and uic from Qt3 have '-qt3' suffixes. The latter names might come from Qt4, so prefer the version-specific names. Patch from Modestas Vainius. See issue #9659.
Diffstat (limited to 'Modules/FindQt3.cmake')
-rw-r--r--Modules/FindQt3.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
index 46c337f..d2f2f90 100644
--- a/Modules/FindQt3.cmake
+++ b/Modules/FindQt3.cmake
@@ -138,7 +138,7 @@ FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY
# qt 3 should prefer QTDIR over the PATH
FIND_PROGRAM(QT_MOC_EXECUTABLE
- NAMES moc moc-qt3
+ NAMES moc-qt3 moc
HINTS
$ENV{QTDIR}/bin
PATHS
@@ -160,7 +160,8 @@ IF(QT_MOC_EXECUTABLE)
ENDIF(QT_MOC_EXECUTABLE)
# qt 3 should prefer QTDIR over the PATH
-FIND_PROGRAM(QT_UIC_EXECUTABLE uic
+FIND_PROGRAM(QT_UIC_EXECUTABLE
+ NAMES uic-qt3 uic
HINTS
$ENV{QTDIR}/bin
PATHS