summaryrefslogtreecommitdiffstats
path: root/Modules/FindQt3.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-06-09 20:04:06 (GMT)
committerBrad King <brad.king@kitware.com>2008-06-09 20:04:06 (GMT)
commite2ec3b671b3753da42df167ba1a4e496d08b5ce2 (patch)
treefe2cea51ff2d1d1e681483a4bdad911fea88457c /Modules/FindQt3.cmake
parent05434489079708e9896d03b7fc9153ded1d960b4 (diff)
downloadCMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.zip
CMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.tar.gz
CMake-e2ec3b671b3753da42df167ba1a4e496d08b5ce2.tar.bz2
ENH: Cleanup Find* modules with new HINTS feature
- The find_* commands now provide a HINTS option. - The option specifies paths to be preferred over the system paths. - Many Find* modules were using two find calls with NO_DEFAULT_PATH to approximate the behavior, but that blocked users from overriding things with CMAKE_PREFIX_PATH. - This commit uses the HINTS feature to get desired behavior in only one find command call.
Diffstat (limited to 'Modules/FindQt3.cmake')
-rw-r--r--Modules/FindQt3.cmake14
1 files changed, 3 insertions, 11 deletions
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake
index 14c0ac4..658d7ec 100644
--- a/Modules/FindQt3.cmake
+++ b/Modules/FindQt3.cmake
@@ -122,13 +122,8 @@ FIND_LIBRARY(QT_QASSISTANTCLIENT_LIBRARY
# qt 3 should prefer QTDIR over the PATH
FIND_PROGRAM(QT_MOC_EXECUTABLE
NAMES moc moc-qt3
- PATHS
+ HINTS
$ENV{QTDIR}/bin
- NO_DEFAULT_PATH
-)
-
-FIND_PROGRAM(QT_MOC_EXECUTABLE
- NAMES moc moc-qt3
PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
@@ -150,15 +145,12 @@ ENDIF(QT_MOC_EXECUTABLE)
# qt 3 should prefer QTDIR over the PATH
FIND_PROGRAM(QT_UIC_EXECUTABLE uic
- PATHS
+ HINTS
$ENV{QTDIR}/bin
- NO_DEFAULT_PATH
-)
-FIND_PROGRAM(QT_UIC_EXECUTABLE uic
+ PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
- $ENV{QTDIR}/bin
${GLOB_PATHS_BIN}
/usr/local/qt/bin
/usr/lib/qt/bin