aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Reed <ranger@befunk.com>2006-01-28 21:59:31 +0000
committerBenjamin Reed <ranger@befunk.com>2006-01-28 21:59:31 +0000
commit8f58cbe87706dcb835998a6f4302e9a056729fb5 (patch)
tree02e485dc15696c2d8b659e10d8e8c880171aed38
parentf6763a5b8a691ce8c4320228d7f4f5e8354ec125 (diff)
downloadextra-cmake-modules-8f58cbe87706dcb835998a6f4302e9a056729fb5.tar.gz
extra-cmake-modules-8f58cbe87706dcb835998a6f4302e9a056729fb5.tar.bz2
stupid non-framework QtTest
svn path=/trunk/KDE/kdelibs/; revision=503363
-rw-r--r--modules/FindQt4.cmake10
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake
index 8d5169b6..656dc36e 100644
--- a/modules/FindQt4.cmake
+++ b/modules/FindQt4.cmake
@@ -325,9 +325,9 @@ IF(QT4_QMAKE_FOUND)
IF (QT_USE_FRAMEWORKS)
# If FIND_LIBRARY found libraries in Apple frameworks, we would not have
# to jump through these hoops.
- SET(QT_QTCORE_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtCore"
+ SET(QT_QTCORE_LIBRARY "-F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} -framework QtCore"
CACHE STRING "The QtCore library.")
- SET(QT_QTCORE_LIBRARY_DEBUG "-F${QT_LIBRARY_DIR} -framework QtCore"
+ SET(QT_QTCORE_LIBRARY_DEBUG "-F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} -framework QtCore"
CACHE STRING "The QtCore library.")
SET(QT_QT3SUPPORT_LIBRARY "-framework Qt3Support"
CACHE STRING "The Qt3Support library.")
@@ -357,9 +357,11 @@ IF(QT4_QMAKE_FOUND)
CACHE STRING "The QtSvg library.")
SET(QT_QTSVG_LIBRARY_DEBUG "-framework QtSvg"
CACHE STRING "The QtSvg library.")
- SET(QT_QTTEST_LIBRARY "-framework QtTest"
+
+ # WTF? why don't we have frameworks? :P
+ SET(QT_QTTEST_LIBRARY "-lQtTest"
CACHE STRING "The QtTest library.")
- SET(QT_QTTEST_LIBRARY_DEBUG "-framework QtTest"
+ SET(QT_QTTEST_LIBRARY_DEBUG "-lQtTest"
CACHE STRING "The QtTest library.")
ELSE (QT_USE_FRAMEWORKS)