46 lines
1.4 KiB
Plaintext
46 lines
1.4 KiB
Plaintext
$OpenBSD: patch-Modules_FindQt3_cmake,v 1.2 2012/05/07 07:06:20 dcoppa Exp $
|
|
--- Modules/FindQt3.cmake.orig Wed Apr 18 20:10:54 2012
|
|
+++ Modules/FindQt3.cmake Mon Apr 30 11:07:25 2012
|
|
@@ -64,6 +64,7 @@ FIND_PATH(QT_INCLUDE_DIR qt.h
|
|
/usr/share/qt3/include
|
|
C:/Progra~1/qt/include
|
|
/usr/include/qt3
|
|
+ ${LOCALBASE}/include/X11/qt3
|
|
)
|
|
|
|
# if qglobal.h is not in the qt_include_dir then set
|
|
@@ -143,7 +144,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 moc3 moc3-mt moc
|
|
HINTS
|
|
$ENV{QTDIR}/bin
|
|
PATHS
|
|
@@ -152,6 +153,7 @@ FIND_PROGRAM(QT_MOC_EXECUTABLE
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
|
|
$ENV{QTDIR}/bin
|
|
${GLOB_PATHS_BIN}
|
|
+ ${LOCALBASE}/bin
|
|
/usr/local/qt/bin
|
|
/usr/lib/qt/bin
|
|
/usr/lib/qt3/bin
|
|
@@ -166,7 +168,7 @@ ENDIF(QT_MOC_EXECUTABLE)
|
|
|
|
# qt 3 should prefer QTDIR over the PATH
|
|
FIND_PROGRAM(QT_UIC_EXECUTABLE
|
|
- NAMES uic-qt3 uic
|
|
+ NAMES uic-qt3 uic3 uic3-mt uic
|
|
HINTS
|
|
$ENV{QTDIR}/bin
|
|
PATHS
|
|
@@ -174,6 +176,7 @@ FIND_PROGRAM(QT_UIC_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}
|
|
+ ${LOCALBASE}/bin
|
|
/usr/local/qt/bin
|
|
/usr/lib/qt/bin
|
|
/usr/lib/qt3/bin
|