From d53f699751047b18e7c729de3cdcc7eb45b32dd1 Mon Sep 17 00:00:00 2001
From: Anderson Lizardo <anderson.lizardo@openbossa.org>
Date: Mon, 16 Aug 2010 21:59:45 -0400
Subject: 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>
---
 PySide/QtWebKit/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'PySide/QtWebKit')

diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt
index f2ca036f3..4a893607d 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
-- 
cgit v1.2.3