d475b0a293
"There was no cmake fallout in the bulk on amd64" jasper@ Also tested by Brad with a handful of CMake using ports
48 lines
1.9 KiB
Plaintext
48 lines
1.9 KiB
Plaintext
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.15 2012/08/31 12:28:31 dcoppa Exp $
|
|
--- Modules/FindQt4.cmake.orig Thu Aug 9 20:15:19 2012
|
|
+++ Modules/FindQt4.cmake Thu Aug 23 11:25:47 2012
|
|
@@ -486,13 +486,20 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRE
|
|
# check for qmake
|
|
# Debian uses qmake-qt4
|
|
# macports' Qt uses qmake-mac
|
|
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
|
|
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
|
|
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
|
|
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
|
|
- $ENV{QTDIR}/bin
|
|
- DOC "The qmake executable for the Qt installation to use"
|
|
-)
|
|
+IF(CMAKE_SYSTEM MATCHES "OpenBSD*")
|
|
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 PATHS
|
|
+ $ENV{QTDIR}/bin
|
|
+ DOC "The qmake executable for the Qt installation to use"
|
|
+ )
|
|
+ELSE(CMAKE_SYSTEM MATCHES "OpenBSD*")
|
|
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
|
|
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
|
|
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
|
|
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
|
|
+ $ENV{QTDIR}/bin
|
|
+ DOC "The qmake executable for the Qt installation to use"
|
|
+ )
|
|
+ENDIF(CMAKE_SYSTEM MATCHES "OpenBSD*")
|
|
|
|
# double check that it was a Qt4 qmake, if not, re-find with different names
|
|
IF (QT_QMAKE_EXECUTABLE)
|
|
@@ -959,13 +966,13 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
|
|
ENDIF(QT_QMAKE_CHANGED)
|
|
|
|
FIND_PROGRAM(QT_MOC_EXECUTABLE
|
|
- NAMES moc-qt4 moc
|
|
+ NAMES moc4 moc-qt4 moc
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
|
|
)
|
|
|
|
FIND_PROGRAM(QT_UIC_EXECUTABLE
|
|
- NAMES uic-qt4 uic
|
|
+ NAMES uic4 uic-qt4 uic
|
|
PATHS ${QT_BINARY_DIR}
|
|
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
|
|
)
|