diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-21 20:50:49 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-21 20:50:49 (GMT) |
| commit | b0b34dc7e52f96e5806ba9616b9321e7a6d4d70a (patch) | |
| tree | 5bf746f0ad4bd61383691934a173295bf7ae08a5 /Modules | |
| parent | 7ff741f14db62415cda38cebe92184b1d9d589ca (diff) | |
| download | CMake-b0b34dc7e52f96e5806ba9616b9321e7a6d4d70a.zip CMake-b0b34dc7e52f96e5806ba9616b9321e7a6d4d70a.tar.gz CMake-b0b34dc7e52f96e5806ba9616b9321e7a6d4d70a.tar.bz2 | |
ENH: support QtScript (since Qt 4.3), #4632
Alex
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindQt4.cmake | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 44bbe2c..1816403 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -23,6 +23,7 @@ # QT_USE_QTTEST # QT_USE_QTUITOOLS # QT_USE_QTDBUS +# QT_USE_QTSCRIPT # # All the libraries required are stored in a variable called QT_LIBRARIES. # Add this variable to your TARGET_LINK_LIBRARIES. @@ -73,6 +74,7 @@ # QT_QTSQL_FOUND True if QtSql was found. # QT_QTXML_FOUND True if QtXml was found. # QT_QTSVG_FOUND True if QtSvg was found. +# QT_QTSCRIPT_FOUND True if QtScript was found. # QT_QTTEST_FOUND True if QtTest was found. # QT_QTUITOOLS_FOUND True if QtUiTools was found. # @@ -100,6 +102,7 @@ # QT_QTSQL_INCLUDE_DIR Path to "include/QtSql" # QT_QTXML_INCLUDE_DIR Path to "include/QtXml" # QT_QTSVG_INCLUDE_DIR Path to "include/QtSvg" +# QT_QTSCRIPT_INCLUDE_DIR Path to "include/QtScript" # QT_QTTEST_INCLUDE_DIR Path to "include/QtTest" # # QT_LIBRARY_DIR Path to "lib" of Qt4 @@ -168,6 +171,10 @@ # QT_QTSVG_LIBRARY_RELEASE # QT_QTSVG_LIBRARY_DEBUG # +# The QtScript library: QT_QTSCRIPT_LIBRARY +# QT_QTSCRIPT_LIBRARY_RELEASE +# QT_QTSCRIPT_LIBRARY_DEBUG +# # The QtTest library: QT_QTTEST_LIBRARY # QT_QTTEST_LIBRARY_RELEASE # QT_QTTEST_LIBRARY_DEBUG @@ -467,6 +474,14 @@ IF (QT4_QMAKE_FOUND) NO_DEFAULT_PATH ) + # Set QT_QTSCRIPT_INCLUDE_DIR + FIND_PATH(QT_QTSCRIPT_INCLUDE_DIR QtScript + PATHS + ${QT_INCLUDE_DIR}/QtScript + ${QT_LIBRARY_DIR}/QtScript.framework/Headers + NO_DEFAULT_PATH + ) + # Set QT_QTTEST_INCLUDE_DIR FIND_PATH(QT_QTTEST_INCLUDE_DIR QtTest PATHS @@ -627,6 +642,9 @@ IF (QT4_QMAKE_FOUND) FIND_LIBRARY(QT_QTDBUS_LIBRARY_RELEASE NAMES QtDBus QtDBus4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) FIND_LIBRARY(QT_QTDBUS_LIBRARY_DEBUG NAMES QtDBus_debug QtDBus_debug4 QtDBusd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + # Set QT_QTSCRIPT_LIBRARY + FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_RELEASE NAMES QtScript QtScript4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) + FIND_LIBRARY(QT_QTSCRIPT_LIBRARY_DEBUG NAMES QtScript_debug QtScriptd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) IF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE ) IF( NOT Qt4_FIND_QUIETLY AND Qt4_FIND_REQUIRED) @@ -722,6 +740,7 @@ IF (QT4_QMAKE_FOUND) _QT4_ADJUST_LIB_VARS(QTSQL) _QT4_ADJUST_LIB_VARS(QTXML) _QT4_ADJUST_LIB_VARS(QTSVG) + _QT4_ADJUST_LIB_VARS(QTSCRIPT) _QT4_ADJUST_LIB_VARS(QTUITOOLS) _QT4_ADJUST_LIB_VARS(QTTEST) _QT4_ADJUST_LIB_VARS(QTDBUS) |