diff options
| author | Amit Kulkarni <amitkulz@gmail.com> | 2012-12-05 11:36:14 -0600 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-12-05 13:09:43 -0500 |
| commit | f80ccac158c11b21319e6f4a82137bcc88f0dfaf (patch) | |
| tree | abeddd27519380f7d12a20fd34dd8f92a4994e9e /Modules/FindQt3.cmake | |
| parent | 2f49b71b65c7b595650ee61100430e37380bc948 (diff) | |
| download | cmake-f80ccac158c11b21319e6f4a82137bcc88f0dfaf.tar.gz | |
OpenBSD: Add paths for Qt3/Qt4
Handle OpenBSD specific paths in Qt3/Qt4, allowing concurrent building
and installation. Some common programs are renamed with suffixes of
either 3 or 4. Also, allow qt3/qt4 installed under /usr/local to be
searched and recognized appropriately.
Diffstat (limited to 'Modules/FindQt3.cmake')
| -rw-r--r-- | Modules/FindQt3.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake index 07b6fef345..4fc8e406c3 100644 --- a/Modules/FindQt3.cmake +++ b/Modules/FindQt3.cmake @@ -64,6 +64,7 @@ find_path(QT_INCLUDE_DIR qt.h /usr/share/qt3/include C:/Progra~1/qt/include /usr/include/qt3 + /usr/local/include/X11/qt3 ) # if qglobal.h is not in the qt_include_dir then set @@ -146,7 +147,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY # Qt 3 should prefer QTDIR over the PATH find_program(QT_MOC_EXECUTABLE - NAMES moc-qt3 moc + NAMES moc-qt3 moc moc3 moc3-mt HINTS ENV QTDIR PATHS @@ -154,6 +155,7 @@ find_program(QT_MOC_EXECUTABLE "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" ${GLOB_PATHS_BIN} + /usr/local/lib/qt3 /usr/local/qt /usr/lib/qt /usr/lib/qt3 @@ -170,7 +172,7 @@ endif() # Qt 3 should prefer QTDIR over the PATH find_program(QT_UIC_EXECUTABLE - NAMES uic-qt3 uic + NAMES uic-qt3 uic uic3 uic3-mt HINTS ENV QTDIR PATHS |