51 lines
2.4 KiB
Plaintext
51 lines
2.4 KiB
Plaintext
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.22 2014/09/11 10:24:38 dcoppa Exp $
|
|
--- Modules/FindQt4.cmake.orig Thu Jul 31 17:03:56 2014
|
|
+++ Modules/FindQt4.cmake Wed Sep 3 08:23:52 2014
|
|
@@ -514,7 +514,12 @@ endfunction()
|
|
|
|
set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
|
|
|
|
-set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
|
|
+if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
|
|
+ set(_QT4_QMAKE_NAMES qmake4)
|
|
+else()
|
|
+ set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
|
|
+endif()
|
|
+
|
|
_qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
|
|
|
|
if (QT_QMAKE_EXECUTABLE AND QTVERSION)
|
|
@@ -689,6 +694,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
|
|
|
|
# Set QT_INCLUDES
|
|
set( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
|
|
+ # Help QtOpenGL find GL/gl.h
|
|
+ list(APPEND QT_INCLUDES "${X11BASE}/include")
|
|
|
|
|
|
# ask qmake for the documentation directory
|
|
@@ -1135,17 +1142,17 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
|
|
endif()
|
|
endmacro()
|
|
|
|
- _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc-qt4 moc moc4)
|
|
- _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic-qt4 uic uic4)
|
|
+ _find_qt4_program(QT_MOC_EXECUTABLE Qt4::moc moc4 moc-qt4 moc)
|
|
+ _find_qt4_program(QT_UIC_EXECUTABLE Qt4::uic uic4 uic-qt4 uic)
|
|
_find_qt4_program(QT_UIC3_EXECUTABLE Qt4::uic3 uic3)
|
|
_find_qt4_program(QT_RCC_EXECUTABLE Qt4::rcc rcc)
|
|
_find_qt4_program(QT_DBUSCPP2XML_EXECUTABLE Qt4::qdbuscpp2xml qdbuscpp2xml)
|
|
_find_qt4_program(QT_DBUSXML2CPP_EXECUTABLE Qt4::qdbusxml2cpp qdbusxml2cpp)
|
|
- _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate-qt4 lupdate lupdate4)
|
|
- _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease-qt4 lrelease lrelease4)
|
|
+ _find_qt4_program(QT_LUPDATE_EXECUTABLE Qt4::lupdate lupdate4 lupdate-qt4 lupdate)
|
|
+ _find_qt4_program(QT_LRELEASE_EXECUTABLE Qt4::lrelease lrelease4 lrelease-qt4 lrelease)
|
|
_find_qt4_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE Qt4::qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator)
|
|
- _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer-qt4 designer designer4)
|
|
- _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist-qt4 linguist linguist4)
|
|
+ _find_qt4_program(QT_DESIGNER_EXECUTABLE Qt4::designer designer4 designer-qt4 designer)
|
|
+ _find_qt4_program(QT_LINGUIST_EXECUTABLE Qt4::linguist linguist4 linguist-qt4 linguist)
|
|
|
|
if (NOT TARGET Qt4::qmake)
|
|
add_executable(Qt4::qmake IMPORTED)
|