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

(limited to 'PySide/QtDeclarative')

diff --git a/PySide/QtDeclarative/CMakeLists.txt b/PySide/QtDeclarative/CMakeLists.txt
index 940f4d1d3..d2b7e29af 100644
--- a/PySide/QtDeclarative/CMakeLists.txt
+++ b/PySide/QtDeclarative/CMakeLists.txt
@@ -21,7 +21,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeview_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qtdeclarative_module_wrapper.cpp
 )
 
-set(QtDeclarative_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtDeclarative_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}:${QtNetwork_BINARY_DIR}")
+set(QtDeclarative_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}:${QtDeclarative_SOURCE_DIR}")
 
 set(QtDeclarative_include_dirs  ${CMAKE_CURRENT_SOURCE_DIR}
                             ${QT_QTCORE_INCLUDE_DIR}
@@ -51,7 +51,6 @@ set(QtDeclarative_libraries   pyside
 set(QtDeclarative_deps QtGui QtNetwork)
 
 create_pyside_module(QtDeclarative
-                     ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_declarative.xml
                      QtDeclarative_include_dirs
                      QtDeclarative_libraries
                      QtDeclarative_deps
-- 
cgit v1.2.3