diff options
author | Benjamin Reed <ranger@befunk.com> | 2007-03-13 19:03:27 +0000 |
---|---|---|
committer | Benjamin Reed <ranger@befunk.com> | 2007-03-13 19:03:27 +0000 |
commit | a195aafb618cb2fbab7ed3f2563d9ee6182de4e1 (patch) | |
tree | 6a5c550045c4f22024d32002d3ac84c634595e6b | |
parent | 14892e1ebfa08cb5947606af1ae3d8e3f157357a (diff) | |
download | extra-cmake-modules-a195aafb618cb2fbab7ed3f2563d9ee6182de4e1.tar.gz extra-cmake-modules-a195aafb618cb2fbab7ed3f2563d9ee6182de4e1.tar.bz2 |
add -F for finding qt in a non-default location
svn path=/trunk/KDE/kdelibs/; revision=642253
-rw-r--r-- | modules/FindQt4.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 8b97377e..f43282ff 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -562,63 +562,63 @@ IF (QT4_QMAKE_FOUND) IF(EXISTS ${QT_LIBRARY_DIR}/QtGui.framework) SET(QT_QTGUI_FOUND TRUE) - SET(QT_QTGUI_LIBRARY "-framework QtGui" CACHE STRING "The QtGui library.") + SET(QT_QTGUI_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtGui" CACHE STRING "The QtGui library.") ELSE(EXISTS ${QT_LIBRARY_DIR}/QtGui.framework) SET(QT_QTGUI_FOUND FALSE) ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtGui.framework) IF(EXISTS ${QT_LIBRARY_DIR}/Qt3Support.framework) SET(QT_QT3SUPPORT_FOUND TRUE) - SET(QT_QT3SUPPORT_LIBRARY "-framework Qt3Support" CACHE STRING "The Qt3Support library.") + SET(QT_QT3SUPPORT_LIBRARY "-F${QT_LIBRARY_DIR} -framework Qt3Support" CACHE STRING "The Qt3Support library.") ELSE(EXISTS ${QT_LIBRARY_DIR}/Qt3Support.framework) SET(QT_QT3SUPPORT_FOUND FALSE) ENDIF(EXISTS ${QT_LIBRARY_DIR}/Qt3Support.framework) IF(EXISTS ${QT_LIBRARY_DIR}/QtNetwork.framework) SET(QT_QTNETWORK_FOUND TRUE) - SET(QT_QTNETWORK_LIBRARY "-framework QtNetwork" CACHE STRING "The QtNetwork library.") + SET(QT_QTNETWORK_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtNetwork" CACHE STRING "The QtNetwork library.") ELSE(EXISTS ${QT_LIBRARY_DIR}/QtNetwork.framework) SET(QT_QTNETWORK_FOUND FALSE) ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtNetwork.framework) IF(EXISTS ${QT_LIBRARY_DIR}/QtOpenGL.framework) SET(QT_QTOPENGL_FOUND TRUE) - SET(QT_QTOPENGL_LIBRARY "-framework QtOpenGL" CACHE STRING "The QtOpenGL library.") + SET(QT_QTOPENGL_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtOpenGL" CACHE STRING "The QtOpenGL library.") ELSE(EXISTS ${QT_LIBRARY_DIR}/QtOpenGL.framework) SET(QT_QTOPENGL_FOUND FALSE) ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtOpenGL.framework) IF(EXISTS ${QT_LIBRARY_DIR}/QtSql.framework) SET(QT_QTSQL_FOUND TRUE) - SET(QT_QTSQL_LIBRARY "-framework QtSql" CACHE STRING "The QtSql library.") + SET(QT_QTSQL_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtSql" CACHE STRING "The QtSql library.") ELSE(EXISTS ${QT_LIBRARY_DIR}/QtSql.framework) SET(QT_QTSQL_FOUND FALSE) ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtSql.framework) IF(EXISTS ${QT_LIBRARY_DIR}/QtXml.framework) SET(QT_QTXML_FOUND TRUE) - SET(QT_QTXML_LIBRARY "-framework QtXml" CACHE STRING "The QtXml library.") + SET(QT_QTXML_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtXml" CACHE STRING "The QtXml library.") ELSE(EXISTS ${QT_LIBRARY_DIR}/QtXml.framework) SET(QT_QTXML_FOUND FALSE) ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtXml.framework) IF(EXISTS ${QT_LIBRARY_DIR}/QtSvg.framework) SET(QT_QTSVG_FOUND TRUE) - SET(QT_QTSVG_LIBRARY "-framework QtSvg" CACHE STRING "The QtSvg library.") + SET(QT_QTSVG_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtSvg" CACHE STRING "The QtSvg library.") ELSE(EXISTS ${QT_LIBRARY_DIR}/QtSvg.framework) SET(QT_QTSVG_FOUND FALSE) ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtSvg.framework) IF(EXISTS ${QT_LIBRARY_DIR}/QtDBus.framework) SET(QT_QTDBUS_FOUND TRUE) - SET(QT_QTDBUS_LIBRARY "-framework QtDBus" CACHE STRING "The QtDBus library.") + SET(QT_QTDBUS_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtDBus" CACHE STRING "The QtDBus library.") ELSE(EXISTS ${QT_LIBRARY_DIR}/QtDBus.framework) SET(QT_QTDBUS_FOUND FALSE) ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtDBus.framework) IF(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework) SET(QT_QTTEST_FOUND TRUE) - SET(QT_QTTEST_LIBRARY "-framework QtTest" CACHE STRING "The QtTest library.") + SET(QT_QTTEST_LIBRARY "-F${QT_LIBRARY_DIR} -framework QtTest" CACHE STRING "The QtTest library.") ELSE(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework) SET(QT_QTTEST_FOUND FALSE) ENDIF(EXISTS ${QT_LIBRARY_DIR}/QtTest.framework) |