[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.117 1.118

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Qt/Mac binary install puts QtCLucene library in a different place than the
      normal Qt frameworks.  Let's find it.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.117
retrieving revision 1.118
diff -C 2 -d -r1.117 -r1.118
*** FindQt4.cmake	3 May 2008 21:55:05 -0000	1.117
--- FindQt4.cmake	9 May 2008 15:50:56 -0000	1.118
***************
*** 795,798 ****
--- 795,802 ----
    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