diff options
| -rw-r--r-- | modules/FindQt4.cmake | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 73d3dd13..0a9a698d 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -163,8 +163,8 @@ # QT_QTGUI_FOUND True if QtGui was found. # QT_QT3SUPPORT_FOUND True if Qt3Support was found. # QT_QTASSISTANT_FOUND True if QtAssistant was found. -# QT_QAXCONTAINER_FOUND True if QAxContainer was found (Windows only). -# QT_QAXSERVER_FOUND True if QAxServer was found (Windows only). +# QT_QAXCONTAINER_FOUND True if QAxContainer was found (Windows only). +# QT_QAXSERVER_FOUND True if QAxServer was found (Windows only). # QT_QTDBUS_FOUND True if QtDBus was found. # QT_QTDESIGNER_FOUND True if QtDesigner was found. # QT_QTDESIGNERCOMPONENTS True if QtDesignerComponents was found. @@ -210,9 +210,9 @@ # QT_QT_INCLUDE_DIR Path to "include/Qt" # QT_QT3SUPPORT_INCLUDE_DIR Path to "include/Qt3Support" # QT_QTASSISTANT_INCLUDE_DIR Path to "include/QtAssistant" -# QT_QTASSISTANTCLIENT_INCLUDE_DIR Path to "include/QtAssistantClient" -# QT_QAXCONTAINER_INCLUDE_DIR Path to "include/ActiveQt" (Windows only) -# QT_QAXSERVER_INCLUDE_DIR Path to "include/ActiveQt" (Windows only) +# QT_QTASSISTANTCLIENT_INCLUDE_DIR Path to "include/QtAssistant" +# QT_QAXCONTAINER_INCLUDE_DIR Path to "include/ActiveQt" (Windows only) +# QT_QAXSERVER_INCLUDE_DIR Path to "include/ActiveQt" (Windows only) # QT_QTCORE_INCLUDE_DIR Path to "include/QtCore" # QT_QTDBUS_INCLUDE_DIR Path to "include/QtDBus" # QT_QTDESIGNER_INCLUDE_DIR Path to "include/QtDesigner" @@ -249,9 +249,9 @@ # # The QtAssistantClient library: QT_QTASSISTANTCLIENT_LIBRARY # -# The QtAxServer library: QT_QAXSERVER_LIBRARY +# The QAxServer library: QT_QAXSERVER_LIBRARY # -# The QtAxContainer library: QT_QTAXCONTAINER_LIBRARY +# The QAxContainer library: QT_QAXCONTAINER_LIBRARY # # The QtCore library: QT_QTCORE_LIBRARY # @@ -643,19 +643,17 @@ IF (QT4_QMAKE_FOUND) ENDFOREACH(QT_MODULE) IF(WIN32) - # Set QT_QTAXSERVER_INCLUDE_DIR - FIND_PATH(QT_QTAXSERVER_INCLUDE_DIR QtAxServer - PATHS - ${QT_HEADERS_DIR}/QtAxServer - NO_DEFAULT_PATH - ) - - # Set QT_QTAXCONTAINER_INCLUDE_DIR - FIND_PATH(QT_QTAXCONTAINER_INCLUDE_DIR QtAxContainer - PATHS - ${QT_HEADERS_DIR}/QtAxContainer - NO_DEFAULT_PATH - ) + # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR + FIND_PATH(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt + PATHS + ${QT_HEADERS_DIR}/ActiveQt + NO_DEFAULT_PATH + ) + FIND_PATH(QT_QAXSERVER_INCLUDE_DIR ActiveQt + PATHS + ${QT_HEADERS_DIR}/ActiveQt + NO_DEFAULT_PATH + ) ENDIF(WIN32) # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR @@ -954,9 +952,9 @@ IF (QT4_QMAKE_FOUND) FIND_LIBRARY(QT_QTASSISTANTCLIENT_LIBRARY NAMES QtAssistantClient QtAssistantClient_debug QtAssistantClient4 QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) IF(WIN32) - FIND_LIBRARY(QT_QTAXSERVER_LIBRARY NAMES QtAxServer QtAxServer4 QtAxServerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QAXSERVER_LIBRARY NAMES QAxServer QAxServer4 QAxServerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - FIND_LIBRARY(QT_QTAXCONTAINER_LIBRARY NAMES QtAxContainer QtAxContainer4 QtAxContainerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QAXCONTAINER_LIBRARY NAMES QAxContainer QAxContainer4 QAxContainerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) ENDIF(WIN32) FIND_LIBRARY(QT_QTHELP_LIBRARY NAMES QtHelp QtHelp_debug QtHelp4 QtHelpd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) @@ -996,10 +994,10 @@ IF (QT4_QMAKE_FOUND) FIND_LIBRARY(QT_QTDBUS_LIBRARY_DEBUG NAMES QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG NAMES QtAssistantClientd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - FIND_LIBRARY(QT_QTAXSERVER_LIBRARY_RELEASE NAMES QtAxServer PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - FIND_LIBRARY(QT_QTAXSERVER_LIBRARY_DEBUG NAMES QtAxServerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - FIND_LIBRARY(QT_QTAXCONTAINER_LIBRARY_RELEASE NAMES QtAxContainer PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) - FIND_LIBRARY(QT_QTAXCONTAINER_LIBRARY_DEBUG NAMES QtAxContainerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QAXSERVER_LIBRARY_RELEASE NAMES QAxServer PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QAXSERVER_LIBRARY_DEBUG NAMES QAxServerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QAXCONTAINER_LIBRARY_RELEASE NAMES QAxContainer PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QAXCONTAINER_LIBRARY_DEBUG NAMES QAxContainerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_RELEASE NAMES QtDesigner4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_DEBUG NAMES QtDesignerd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) |