diff options
author | Anderson Lizardo <anderson.lizardo@openbossa.org> | 2010-08-16 21:59:45 -0400 |
---|---|---|
committer | Anderson Lizardo <anderson.lizardo@openbossa.org> | 2010-08-26 11:06:55 -0400 |
commit | d53f699751047b18e7c729de3cdcc7eb45b32dd1 (patch) | |
tree | cf5e0174ecfda9d08f3dd37d726a3c1834683cc4 /PySide/QtScript | |
parent | 3c36d444729ee9285bb4ab0252968057bf904a8d (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/QtScript')
-rw-r--r-- | PySide/QtScript/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/PySide/QtScript/CMakeLists.txt b/PySide/QtScript/CMakeLists.txt index d9e8264a8..87f7e066d 100644 --- a/PySide/QtScript/CMakeLists.txt +++ b/PySide/QtScript/CMakeLists.txt @@ -25,7 +25,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptvalueiterator_wrapper.cpp ${QtScript_46_SRC} ) -set(QtScript_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}") +set(QtScript_typesystem_path "${QtCore_SOURCE_DIR}") set(QtScript_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript ${QT_INCLUDE_DIR} @@ -41,7 +41,6 @@ set(QtScript_libraries pyside ${QT_QTSCRIPT_LIBRARY}) set(QtScript_deps QtCore) create_pyside_module(QtScript - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_script.xml QtScript_include_dirs QtScript_libraries QtScript_deps |