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/QtXmlPatterns/CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'PySide/QtXmlPatterns')

diff --git a/PySide/QtXmlPatterns/CMakeLists.txt b/PySide/QtXmlPatterns/CMakeLists.txt
index 3456e9edc..4db6e9de7 100644
--- a/PySide/QtXmlPatterns/CMakeLists.txt
+++ b/PySide/QtXmlPatterns/CMakeLists.txt
@@ -26,7 +26,7 @@ set(QtXmlPatterns_SRC
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns/qxmlserializer_wrapper.cpp
     ${QtXmlPatterns_46_SRC}
 )
-set(QtXmlPatterns_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}")
+set(QtXmlPatterns_typesystem_path "${QtCore_SOURCE_DIR}")
 set(QtXmlPatterns_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
                                 ${QT_QTCORE_INCLUDE_DIR}
                                 ${QT_QTXMLPATTERNS_INCLUDE_DIR}
@@ -41,7 +41,6 @@ set(QtXmlPatterns_libraries     pyside
                                 ${QT_QTXMLPATTERNS_LIBRARY})
 set(QtXmlPatterns_deps QtCore)
 create_pyside_module(QtXmlPatterns
-                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_xmlpatterns.xml
                      QtXmlPatterns_include_dirs
                      QtXmlPatterns_libraries
                      QtXmlPatterns_deps
-- 
cgit v1.2.3