kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fix regression in finding QtAssistant

This commit is contained in:
Clinton Stimpson 2008-10-20 13:31:50 -04:00
parent 0325639f30
commit f33943036e
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/FindQt4.cmake
View File

@ -322,7 +322,6 @@ IF (QT_QMAKE_EXECUTABLE)
IF(QT_QMAKE_EXECUTABLE_LAST AND NOT QT_QMAKE_EXECUTABLE_LAST MATCHES "^${QT_QMAKE_EXECUTABLE}$") IF(QT_QMAKE_EXECUTABLE_LAST AND NOT QT_QMAKE_EXECUTABLE_LAST MATCHES "^${QT_QMAKE_EXECUTABLE}$")
SET(QT_QMAKE_CHANGED 1) SET(QT_QMAKE_CHANGED 1)
MESSAGE("qmake changed")
ENDIF(QT_QMAKE_EXECUTABLE_LAST AND NOT QT_QMAKE_EXECUTABLE_LAST MATCHES "^${QT_QMAKE_EXECUTABLE}$") ENDIF(QT_QMAKE_EXECUTABLE_LAST AND NOT QT_QMAKE_EXECUTABLE_LAST MATCHES "^${QT_QMAKE_EXECUTABLE}$")
SET(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL "" FORCE) SET(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL "" FORCE)
@ -482,7 +481,7 @@ IF (QT4_QMAKE_FOUND)
SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools SET(QT_MODULES QtCore QtGui Qt3Support QtSvg QtScript QtTest QtUiTools
QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork
QtNsPlugin QtOpenGL QtSql QtXml QtAssistant QtDesigner QtDBus) QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus)
IF(QT_QMAKE_CHANGED) IF(QT_QMAKE_CHANGED)
FOREACH(QT_MODULE ${QT_MODULES}) FOREACH(QT_MODULE ${QT_MODULES})
@ -497,6 +496,9 @@ IF (QT4_QMAKE_FOUND)
SET(QT_QTASSISTANTCLIENT_INCLUDE_DIR NOTFOUND) SET(QT_QTASSISTANTCLIENT_INCLUDE_DIR NOTFOUND)
SET(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NOTFOUND) SET(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NOTFOUND)
SET(QT_QTASSISTANTCLIENT_LIBRARY_DEBUG 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_RELEASE NOTFOUND)
SET(QT_QTCLUCENE_LIBRARY_DEBUG NOTFOUND) SET(QT_QTCLUCENE_LIBRARY_DEBUG NOTFOUND)
ENDIF(QT_QMAKE_CHANGED) ENDIF(QT_QMAKE_CHANGED)
@ -518,7 +520,15 @@ IF (QT4_QMAKE_FOUND)
${QT_LIBRARY_DIR}/QtDesigner.framework/Headers ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
NO_DEFAULT_PATH 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 # Set QT_QTASSISTANTCLIENT_INCLUDE_DIR
FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient FIND_PATH(QT_QTASSISTANTCLIENT_INCLUDE_DIR QAssistantClient
PATHS PATHS
@ -631,6 +641,10 @@ IF (QT4_QMAKE_FOUND)
# Set QT_QTASSISTANTCLIENT_LIBRARY # Set QT_QTASSISTANTCLIENT_LIBRARY
FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) 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) 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 # Set QT_QTHELP_LIBRARY
FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene QtCLucene4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene QtCLucene4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)