diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2008-03-14 16:11:01 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2008-03-14 16:11:01 (GMT) |
| commit | f4c319b60bdb75d67ade6429da8d41eae3dbc96c (patch) | |
| tree | 9dd9dd5693a9c21dc4e68b23b959a5123c24df59 | |
| parent | 5a112028b746557ffdc10b6346a535a109f17ed0 (diff) | |
| download | CMake-f4c319b60bdb75d67ade6429da8d41eae3dbc96c.zip CMake-f4c319b60bdb75d67ade6429da8d41eae3dbc96c.tar.gz CMake-f4c319b60bdb75d67ade6429da8d41eae3dbc96c.tar.bz2 | |
ENH: Support static Qt 4.4 builds using QtHelp module.
| -rw-r--r-- | Modules/FindQt4.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 6e66b6f..b3358f3 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -733,6 +733,8 @@ IF (QT4_QMAKE_FOUND) # Set QT_QTHELP_LIBRARY FIND_LIBRARY(QT_QTHELP_LIBRARY_RELEASE NAMES QtHelp QtHelp4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) 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) # Set QT_QTWEBKIT_LIBRARY FIND_LIBRARY(QT_QTWEBKIT_LIBRARY_RELEASE NAMES QtWebKit QtWebKit4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) @@ -823,6 +825,7 @@ IF (QT4_QMAKE_FOUND) _QT4_ADJUST_LIB_VARS(QTWEBKIT) _QT4_ADJUST_LIB_VARS(QTXMLPATTERNS) _QT4_ADJUST_LIB_VARS(PHONON) + _QT4_ADJUST_LIB_VARS(QTCLUCENE) # platform dependent libraries IF(Q_WS_X11) @@ -1266,6 +1269,7 @@ IF (QT4_QMAKE_FOUND) SET(QT_GUI_LIB_DEPENDENCIES "") SET(QT_CORE_LIB_DEPENDENCIES "") + SET(QT_HELP_LIB_DEPENDENCIES ${QT_QTCLUCENE_LIBRARY}) # build using shared Qt needs -DQT_DLL IF(NOT QT_CONFIG MATCHES "static") |