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/QtNetwork | |
| 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/QtNetwork')
| -rw-r--r-- | PySide/QtNetwork/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt index 0d89e2869..ca0599314 100644 --- a/PySide/QtNetwork/CMakeLists.txt +++ b/PySide/QtNetwork/CMakeLists.txt @@ -84,7 +84,7 @@ set(OPENSSL_SOURCES CHECK_QT_NETWORK_MACRO("Network OPENSSL" QT_NO_OPENSSL OPENSSL_SOURCES QtNetwork_SRC) -set(QtNetwork_typesystem_path "${CMAKE_CURRENT_SOURCE_DIR}:${QtCore_SOURCE_DIR}") +set(QtNetwork_typesystem_path "${QtCore_SOURCE_DIR}") set(QtNetwork_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/ ${QT_INCLUDE_DIR} @@ -101,7 +101,6 @@ set(QtNetwork_libraries pyside set(QtNetwork_deps QtCore) create_pyside_module(QtNetwork - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_network.xml QtNetwork_include_dirs QtNetwork_libraries QtNetwork_deps |