summaryrefslogtreecommitdiffstats
path: root/PySide/QtWebKit
diff options
context:
space:
mode:
authorAnderson Lizardo <anderson.lizardo@openbossa.org>2010-08-16 21:59:45 -0400
committerAnderson Lizardo <anderson.lizardo@openbossa.org>2010-08-26 11:06:55 -0400
commitd53f699751047b18e7c729de3cdcc7eb45b32dd1 (patch)
treecf5e0174ecfda9d08f3dd37d726a3c1834683cc4 /PySide/QtWebKit
parent3c36d444729ee9285bb4ab0252968057bf904a8d (diff)
Simplify handling of typesystems for multiple OSes
* Factor out install() commands into PySide/CMakeLists.txt * Drop typesystem_<module>_common.xml and typesystem_<module>.xml.in, and make typesystem_<module>_<os>.xml (if exists) include typesystem_<module>.xml (which holds common data) Reviewed-by: Luciano Wolf <luciano.wolf@openbossa.org> Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
Diffstat (limited to 'PySide/QtWebKit')
-rw-r--r--PySide/QtWebKit/CMakeLists.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt
index f2ca036f..4a893607 100644
--- a/PySide/QtWebKit/CMakeLists.txt
+++ b/PySide/QtWebKit/CMakeLists.txt
@@ -31,7 +31,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/webcore_wrapper.cpp
${QtWebKit_46_SRC}
)
-set(QtWebKit_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}")
+set(QtWebKit_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}")
set(QtWebkit_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/
${QT_INCLUDE_DIR}
@@ -53,7 +53,6 @@ set(QtWebKit_libraries pyside
${QT_QTGUI_LIBRARY})
set(QtWebKit_deps QtGui QtNetwork)
create_pyside_module(QtWebKit
- ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_webkit.xml
QtWebkit_include_dirs
QtWebKit_libraries
QtWebKit_deps