diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2008-10-20 17:31:50 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2008-10-20 17:31:50 (GMT) |
| commit | f33943036ef5b35567e31ac6522d85aa4c7dff07 (patch) | |
| tree | b9b0cbd00cd65be48bce0cbd2463a7ba8e43c380 /Modules/FindQt4.cmake | |
| parent | 0325639f302741bd3ae282401549fc586b48c357 (diff) | |
| download | CMake-f33943036ef5b35567e31ac6522d85aa4c7dff07.zip CMake-f33943036ef5b35567e31ac6522d85aa4c7dff07.tar.gz CMake-f33943036ef5b35567e31ac6522d85aa4c7dff07.tar.bz2 | |
BUG: Fix regression in finding QtAssistant
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index f55772f..9b06b32 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -322,7 +322,6 @@ IF (QT_QMAKE_EXECUTABLE) 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}$") 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 QtHelp QtWebKit QtXmlPatterns phonon QtMotif QtNetwork - QtNsPlugin QtOpenGL QtSql QtXml QtAssistant QtDesigner QtDBus) + QtNsPlugin QtOpenGL QtSql QtXml QtDesigner QtDBus) IF(QT_QMAKE_CHANGED) FOREACH(QT_MODULE ${QT_MODULES}) @@ -497,6 +496,9 @@ IF (QT4_QMAKE_FOUND) SET(QT_QTASSISTANTCLIENT_INCLUDE_DIR NOTFOUND) 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) ENDIF(QT_QMAKE_CHANGED) @@ -518,7 +520,15 @@ IF (QT4_QMAKE_FOUND) ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers 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 PATHS @@ -631,6 +641,10 @@ IF (QT4_QMAKE_FOUND) # 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_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 FIND_LIBRARY(QT_QTCLUCENE_LIBRARY_RELEASE NAMES QtCLucene QtCLucene4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) |