[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.138 1.139
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Oct 20 13:31:54 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv11646
Modified Files:
FindQt4.cmake
Log Message:
BUG: Fix regression in finding QtAssistant
Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.138
retrieving revision 1.139
diff -C 2 -d -r1.138 -r1.139
*** FindQt4.cmake 15 Oct 2008 22:05:07 -0000 1.138
--- FindQt4.cmake 20 Oct 2008 17:31:50 -0000 1.139
***************
*** 323,327 ****
IF(QT_QMAKE_EXECUTABLE_LAST AND NOT QT_QMAKE_EXECUTABLE_LAST MATCHES "^${QT_QMAKE_EXECUTABLE}$")
SET(QT_QMAKE_CHANGED 1)
- MESSAGE("qmake changed")
ENDIF(QT_QMAKE_EXECUTABLE_LAST AND NOT QT_QMAKE_EXECUTABLE_LAST MATCHES "^${QT_QMAKE_EXECUTABLE}$")
--- 323,326 ----
***************
*** 483,487 ****
SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools
QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork
! QtNsPlugin QtOpenGL QtSql QtXml QtAssistant QtDesigner QtDBus)
IF(QT_QMAKE_CHANGED)
--- 482,486 ----
SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools
QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork
! QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus)
IF(QT_QMAKE_CHANGED)
***************
*** 498,501 ****
--- 497,503 ----
SET(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NOTFOUND)
SET(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NOTFOUND)
+ SET(QT_QTASSISTANT_INCLUDE_DIR NOTFOUND)
+ SET(QT_QTASSISTANT_LIBRARY_RELEASE NOTFOUND)
+ SET(QT_QTASSISTANT_LIBRARY_DEBUG NOTFOUND)
SET(QT_QTCLUCENE_LIBRARY_RELEASE NOTFOUND)
SET(QT_QTCLUCENE_LIBRARY_DEBUG NOTFOUND)
***************
*** 519,523 ****
NO_DEFAULT_PATH
)
!
# Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
--- 521,533 ----
NO_DEFAULT_PATH
)
!
! # Set QT_QTASSISTANT_INCLUDE_DIR
! FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QAssistantClient
! PATHS
! ${QT_INCLUDE_DIR}/QtAssistant
! ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
! NO_DEFAULT_PATH
! )
!
# Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
***************
*** 632,635 ****
--- 642,649 ----
FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG NAMES QtAssistantClient_debug QtAssistantClientd QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+
+ # Set QT_QTASSISTANT_LIBRARY
+ FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClient_debug QtAssistantClientd QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
# Set QT_QTHELP_LIBRARY
More information about the Cmake-commits
mailing list