summaryrefslogtreecommitdiffstats
path: root/Modules/FindQt3.cmake
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2014-05-20 15:47:54 (GMT)
committerBrad King <brad.king@kitware.com>2014-05-22 12:56:05 (GMT)
commit0645eedb7150aa28f52161abc3f8ef2256aafb54 (patch)
tree04212b25d119fc8e16d9da435dcdfd8bb086949f /Modules/FindQt3.cmake
parent2d5e3d2d2bfd79311c40db173d13f6d0cfb10019 (diff)
downloadCMake-0645eedb7150aa28f52161abc3f8ef2256aafb54.zip
CMake-0645eedb7150aa28f52161abc3f8ef2256aafb54.tar.gz
CMake-0645eedb7150aa28f52161abc3f8ef2256aafb54.tar.bz2
FindQt[34]: Prefer matching versioned tool names
After finding qmake we search in QT_BINARY_DIR for the other Qt tools. Try all versioned executable names before trying the plain executable name. This makes it much more likely that if 2 different major versions are installed in the same prefix CMake will be able to detect a proper set of tools.
Diffstat (limited to 'Modules/FindQt3.cmake')
-rw-r--r--Modules/FindQt3.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
index 4fc6829..86997ba 100644
--- a/Modules/FindQt3.cmake
+++ b/Modules/FindQt3.cmake
@@ -161,7 +161,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
# Qt 3 should prefer QTDIR over the PATH
find_program(QT_MOC_EXECUTABLE
- NAMES moc-qt3 moc moc3 moc3-mt
+ NAMES moc-qt3 moc3 moc3-mt moc
HINTS
ENV QTDIR
PATHS
@@ -186,7 +186,7 @@ endif()
# Qt 3 should prefer QTDIR over the PATH
find_program(QT_UIC_EXECUTABLE
- NAMES uic-qt3 uic uic3 uic3-mt
+ NAMES uic-qt3 uic3 uic3-mt uic
HINTS
ENV QTDIR
PATHS