From a0e63cff1d776eb24d67db19ff838752ccfd6825 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 5 Oct 2009 10:25:36 -0400
Subject: 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.
---
 Modules/FindQt3.cmake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Modules')

diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
index 46c337f17d..d2f2f9013e 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
-- 
cgit v1.2.1