diff options
| author | Benjamin Reed <ranger@befunk.com> | 2006-01-29 16:51:22 +0000 |
|---|---|---|
| committer | Benjamin Reed <ranger@befunk.com> | 2006-01-29 16:51:22 +0000 |
| commit | c5017f5fcf5b2c9846cea77be107c89f535d5df9 (patch) | |
| tree | 91f80eea9861ff0e97a874d85e3ff4291449697a | |
| parent | ce810f657f2c4f53cba4624e00bdb05edb8c3c18 (diff) | |
| download | extra-cmake-modules-c5017f5fcf5b2c9846cea77be107c89f535d5df9.tar.gz extra-cmake-modules-c5017f5fcf5b2c9846cea77be107c89f535d5df9.tar.bz2 | |
mess with the path only or QtTest
svn path=/trunk/KDE/kdelibs/; revision=503588
| -rw-r--r-- | modules/FindKDE4.cmake | 2 | ||||
| -rw-r--r-- | modules/FindQt4.cmake | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index 654d53af..09d1558b 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -40,7 +40,7 @@ ENDIF(UNIX) #this line includes FindQt.cmake, which searches the Qt library and headers FIND_PACKAGE(Qt4 REQUIRED) -SET(QT_AND_KDECORE_LIBS ${QT_DEFINITIONS} ${QT_QTCORE_LIBRARY} kdecore) +SET(QT_AND_KDECORE_LIBS ${QT_QTCORE_LIBRARY} kdecore) #add some KDE specific stuff # not used in Qt4: QT_NO_COMPAT, QT_CLEAN_NAMESPACE, QT_THREAD_SUPPORT diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 656dc36e..a6a4ddd3 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} -L${QT_LIBRARY_DIR} -framework QtCore" + SET(QT_QTCORE_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtCore" CACHE STRING "The QtCore library.") - SET(QT_QTCORE_LIBRARY_DEBUG "-F${QT_LIBRARY_DIR} -L${QT_LIBRARY_DIR} -framework QtCore" + SET(QT_QTCORE_LIBRARY_DEBUG "-F${QT_LIBRARY_DIR} -framework QtCore" CACHE STRING "The QtCore library.") SET(QT_QT3SUPPORT_LIBRARY "-framework Qt3Support" CACHE STRING "The Qt3Support library.") @@ -359,9 +359,9 @@ IF(QT4_QMAKE_FOUND) CACHE STRING "The QtSvg library.") # WTF? why don't we have frameworks? :P - SET(QT_QTTEST_LIBRARY "-lQtTest" + SET(QT_QTTEST_LIBRARY "-L${QT_LIBRARY_DIR} -lQtTest" CACHE STRING "The QtTest library.") - SET(QT_QTTEST_LIBRARY_DEBUG "-lQtTest" + SET(QT_QTTEST_LIBRARY_DEBUG "-L${QT_LIBRARY_DIR} -lQtTest" CACHE STRING "The QtTest library.") ELSE (QT_USE_FRAMEWORKS) |