Attached Files | Qt4-Script.patch [^] (3,439 bytes) 1969-12-31 19:00 [Show Content] [Hide Content]Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.70
diff -u -r1.70 FindQt4.cmake
--- FindQt4.cmake 1 Mar 2007 21:44:32 -0000 1.70
+++ FindQt4.cmake 19 Mar 2007 18:59:09 -0000
@@ -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.
@@ -75,6 +76,7 @@
# QT_QTSVG_FOUND True if QtSvg was found.
# QT_QTTEST_FOUND True if QtTest was found.
# QT_QTUITOOLS_FOUND True if QtUiTools was found.
+# QT_QTSCRIPT_FOUND True if QtScript was found.
#
# QT_DEFINITIONS Definitions to use when compiling code that uses Qt.
#
@@ -101,6 +103,7 @@
# QT_QTXML_INCLUDE_DIR Path to "include/QtXml"
# QT_QTSVG_INCLUDE_DIR Path to "include/QtSvg"
# QT_QTTEST_INCLUDE_DIR Path to "include/QtTest"
+# QT_QTSCRIPT_INCLUDE_DIR Path to "include/QtScript"
#
# QT_LIBRARY_DIR Path to "lib" of Qt4
#
@@ -179,6 +182,10 @@
# The QtUiTools library: QT_QTUITOOLS_LIBRARY
# QT_QTUITOOLS_LIBRARY_RELEASE
# QT_QTUITOOLS_LIBRARY_DEBUG
+#
+# The QtScript library: QT_QTSCRIPT_LIBRARY
+# QT_QTSCRIPT_LIBRARY_RELEASE
+# QT_QTSCRIPT_LIBRARY_DEBUG
#
# also defined, but NOT for general use are
# QT_MOC_EXECUTABLE Where to find the moc tool.
@@ -483,6 +490,13 @@
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_QTMOTIF_INCLUDE_DIR
@@ -626,6 +640,10 @@
# So does any of the debug lib names listed here actually exist ?
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 )
@@ -725,6 +743,7 @@
_QT4_ADJUST_LIB_VARS(QTUITOOLS)
_QT4_ADJUST_LIB_VARS(QTTEST)
_QT4_ADJUST_LIB_VARS(QTDBUS)
+ _QT4_ADJUST_LIB_VARS(QTSCRIPT)
# platform dependent libraries
Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.10
diff -u -r1.10 UseQt4.cmake
--- UseQt4.cmake 4 Jan 2007 21:50:18 -0000 1.10
+++ UseQt4.cmake 19 Mar 2007 18:59:09 -0000
@@ -63,6 +63,10 @@
QT_MODULE_SETUP(UITOOLS)
ENDIF (QT_USE_QTUITOOLS)
+IF (QT_USE_QTSCRIPT)
+ QT_MODULE_SETUP(SCRIPT)
+ENDIF (QT_USE_QTSCRIPT)
+
IF (NOT QT_DONT_USE_QTGUI)
QT_MODULE_SETUP(GUI)
ENDIF (NOT QT_DONT_USE_QTGUI)
|