2007-04-25 10:56:13 -04:00
|
|
|
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.2 2007/04/25 14:56:13 espie Exp $
|
|
|
|
|
--- Modules/FindQt4.cmake.orig Wed Jan 10 18:59:12 2007
|
|
|
|
|
+++ Modules/FindQt4.cmake Wed Apr 25 16:43:46 2007
|
2007-03-20 07:23:10 -04:00
|
|
|
@@ -174,7 +174,7 @@ SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
|
|
|
|
|
SET( QT_DEFINITIONS "")
|
|
|
|
|
|
|
|
|
|
# check for qmake
|
|
|
|
|
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake-qt4 PATHS
|
|
|
|
|
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake qmake-qt4 PATHS
|
|
|
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
|
|
|
|
|
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
|
|
|
|
|
$ENV{QTDIR}/bin
|
2007-04-25 10:56:13 -04:00
|
|
|
@@ -882,7 +882,7 @@ IF (QT4_QMAKE_FOUND)
|
|
|
|
|
###############################################
|
|
|
|
|
|
|
|
|
|
SET(QT_GUI_LIB_DEPENDENCIES "")
|
|
|
|
|
- SET(QT_CORE_LIB_DEPENDENCIES "")
|
|
|
|
|
+ SET(QT_CORE_LIB_DEPENDENCIES "-pthread")
|
|
|
|
|
|
|
|
|
|
# shared build needs -DQT_SHARED
|
|
|
|
|
IF(NOT QT_CONFIG MATCHES "static")
|
