summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2008-05-09 15:50:56 (GMT)
committerClinton Stimpson <clinton@elemtech.com>2008-05-09 15:50:56 (GMT)
commitf4a299a11f10611027325b97eb2a75c4683a7d82 (patch)
tree7c9a9e981bc56373b76473f13b1f6b01b3518be1
parentbd178c4b1f97e1df5663f4179379ee84c0115f07 (diff)
downloadCMake-f4a299a11f10611027325b97eb2a75c4683a7d82.zip
CMake-f4a299a11f10611027325b97eb2a75c4683a7d82.tar.gz
CMake-f4a299a11f10611027325b97eb2a75c4683a7d82.tar.bz2
ENH: Qt/Mac binary install puts QtCLucene library in a different place than the
normal Qt frameworks. Let's find it.
-rw-r--r--Modules/FindQt4.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index ee1b292..d5f2b17 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)