Browse Source

ENH: Support static Qt 4.4 builds using QtHelp module.

Clinton Stimpson 18 years ago
parent
commit
f4c319b60b
1 changed files with 4 additions and 0 deletions
  1. 4 0
      Modules/FindQt4.cmake

+ 4 - 0
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")