[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.97 1.98

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv23271

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Support static Qt 4.4 builds using QtHelp module.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.97
retrieving revision 1.98
diff -C 2 -d -r1.97 -r1.98
*** FindQt4.cmake	13 Mar 2008 23:12:46 -0000	1.97
--- FindQt4.cmake	14 Mar 2008 16:11:01 -0000	1.98
***************
*** 734,737 ****
--- 734,739 ----
    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
***************
*** 824,827 ****
--- 826,830 ----
    _QT4_ADJUST_LIB_VARS(QTXMLPATTERNS)
    _QT4_ADJUST_LIB_VARS(PHONON)
+   _QT4_ADJUST_LIB_VARS(QTCLUCENE)
  
    # platform dependent libraries
***************
*** 1267,1270 ****
--- 1270,1274 ----
    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