From f4a299a11f10611027325b97eb2a75c4683a7d82 Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Fri, 9 May 2008 11:50:56 -0400 Subject: [PATCH] ENH: Qt/Mac binary install puts QtCLucene library in a different place than the normal Qt frameworks. Let's find it. --- Modules/FindQt4.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index ee1b2928b..d5f2b1700 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -794,6 +794,10 @@ IF (QT4_QMAKE_FOUND) FIND_LIBRARY(QT_QTHELP_LIBRARY_DEBUG NAMES QtHelp_debug QtHelpd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene QtCLucene4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_DEBUG NAMES QtCLucene_debug QtCLucened4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + # QtCLucene not with other frameworks with binary installation (in /usr/lib) + IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE) + FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene PATHS ${QT_LIBRARY_DIR}) + ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTCLUCENE_LIBRARY_RELEASE) # Set QT_QTWEBKIT_LIBRARY FIND_LIBRARY(QT_QTWEBKIT_LIBRARY_RELEASE NAMES QtWebKit QtWebKit4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)