summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2010-06-21 15:21:25 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2010-06-21 16:10:40 -0300
commite323cd90f7922ffa8d0121b87c3a00c6706e0dd0 (patch)
tree921d3a0434df77d4340cdfb8f87f098ceb56c47c
parent143946435835163d750b08982a906834a575fa64 (diff)
downloadshiboken-e323cd90f7922ffa8d0121b87c3a00c6706e0dd0.tar.gz
shiboken-e323cd90f7922ffa8d0121b87c3a00c6706e0dd0.tar.xz
shiboken-e323cd90f7922ffa8d0121b87c3a00c6706e0dd0.zip
PySide now installs its type system files.
The pyside.pc file now has a "typesystemdir" variable pointing to the directory where the type system files are installed. Example usage: pkg-config pyside --variable=typesystemdir Also set the "PYSIDE_TYPESYSTEMS" CMake variable on libpyside/PySideConfig.cmake.in to point to the same path of pkg-config's "typesystemdir". Reviewed by Hugo Parente <hugo.lima@openbossa.org> Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
-rw-r--r--PySide/CMakeLists.txt5
-rw-r--r--PySide/QtCore/CMakeLists.txt3
-rw-r--r--PySide/QtDeclarative/CMakeLists.txt3
-rw-r--r--PySide/QtGui/CMakeLists.txt7
-rw-r--r--PySide/QtHelp/CMakeLists.txt3
-rw-r--r--PySide/QtMaemo5/CMakeLists.txt3
-rw-r--r--PySide/QtMultimedia/CMakeLists.txt3
-rw-r--r--PySide/QtNetwork/CMakeLists.txt3
-rw-r--r--PySide/QtOpenGL/CMakeLists.txt2
-rw-r--r--PySide/QtScript/CMakeLists.txt3
-rw-r--r--PySide/QtScriptTools/CMakeLists.txt2
-rw-r--r--PySide/QtSql/CMakeLists.txt3
-rw-r--r--PySide/QtSvg/CMakeLists.txt3
-rw-r--r--PySide/QtTest/CMakeLists.txt3
-rw-r--r--PySide/QtUiTools/CMakeLists.txt2
-rw-r--r--PySide/QtWebKit/CMakeLists.txt3
-rw-r--r--PySide/QtXml/CMakeLists.txt3
-rw-r--r--PySide/QtXmlPatterns/CMakeLists.txt2
-rw-r--r--PySide/phonon/CMakeLists.txt3
-rw-r--r--libpyside/PySideConfig.cmake.in2
-rw-r--r--libpyside/pyside.pc.in1
21 files changed, 60 insertions, 2 deletions
diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt
index 3162cbb1..b1b32864 100644
--- a/PySide/CMakeLists.txt
+++ b/PySide/CMakeLists.txt
@@ -97,3 +97,8 @@ HAS_QT_MODULE(QT_QTSCRIPTTOOLS_FOUND QtScriptTools)
HAS_QT_MODULE(QT_QTMULTIMEDIA_FOUND QtMultimedia)
HAS_QT_MODULE(QT_PHONON_FOUND phonon)
HAS_QT_MODULE(QT_QTDECLARATIVE_FOUND QtDeclarative)
+
+# install
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_templates.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 12a2f4a5..408451fd 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -157,3 +157,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtCore${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/pyside_qtcore_python.h
DESTINATION include/PySide/QtCore/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_core.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtDeclarative/CMakeLists.txt b/PySide/QtDeclarative/CMakeLists.txt
index 587e3b5e..d61fbf9a 100644
--- a/PySide/QtDeclarative/CMakeLists.txt
+++ b/PySide/QtDeclarative/CMakeLists.txt
@@ -56,4 +56,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtDeclarative${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/pyside_qtdeclarative_python.h
DESTINATION include/PySide/QtDeclarative/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_declarative.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
index e9f44d78..db0fd9e4 100644
--- a/PySide/QtGui/CMakeLists.txt
+++ b/PySide/QtGui/CMakeLists.txt
@@ -494,3 +494,10 @@ add_dependencies(QtGui QtCore)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtGui${CMAKE_DEBUG_POSTFIX}.so DESTINATION "${SITE_PACKAGE}/PySide")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/pyside_qtgui_python.h
DESTINATION include/PySide/QtGui/)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_common.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_mac.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_maemo.xml
+ ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_x11.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtHelp/CMakeLists.txt b/PySide/QtHelp/CMakeLists.txt
index 219dfc35..0cc48dbe 100644
--- a/PySide/QtHelp/CMakeLists.txt
+++ b/PySide/QtHelp/CMakeLists.txt
@@ -44,5 +44,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtHelp${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp/pyside_qthelp_python.h
DESTINATION include/PySide/QtHelp/)
-
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_help.xml
+ DESTINATION share/PySide/typesystems)
diff --git a/PySide/QtMaemo5/CMakeLists.txt b/PySide/QtMaemo5/CMakeLists.txt
index 9251cc36..4590e40d 100644
--- a/PySide/QtMaemo5/CMakeLists.txt
+++ b/PySide/QtMaemo5/CMakeLists.txt
@@ -51,7 +51,8 @@ add_dependencies(QtMaemo5 QtGui)
# install
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMaemo5${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/${BINDING_NAME})
-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMaemo5/pyside_qtmaemo5_python.h
DESTINATION include/${BINDING_NAME}/QtMaemo5/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_maemo5.xml
+ DESTINATION share/PySide/typesystems)
diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt
index cbf0b6f3..05f63b55 100644
--- a/PySide/QtMultimedia/CMakeLists.txt
+++ b/PySide/QtMultimedia/CMakeLists.txt
@@ -49,3 +49,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtMultimedia${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/pyside_qtmultimedia_python.h
DESTINATION include/PySide/QtMultimedia/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_multimedia.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt
index e66fa372..7c8d17e2 100644
--- a/PySide/QtNetwork/CMakeLists.txt
+++ b/PySide/QtNetwork/CMakeLists.txt
@@ -125,3 +125,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/pyside_qtnetwork_python.h
DESTINATION include/PySide/QtNetwork/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_network.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtOpenGL/CMakeLists.txt b/PySide/QtOpenGL/CMakeLists.txt
index 1d79e6c1..5849c9a3 100644
--- a/PySide/QtOpenGL/CMakeLists.txt
+++ b/PySide/QtOpenGL/CMakeLists.txt
@@ -59,4 +59,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtOpenGL${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtOpenGL/pyside_qtopengl_python.h
DESTINATION include/PySide/QtOpenGL/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_opengl.xml
+ DESTINATION share/PySide/typesystems)
diff --git a/PySide/QtScript/CMakeLists.txt b/PySide/QtScript/CMakeLists.txt
index 64194390..8b634472 100644
--- a/PySide/QtScript/CMakeLists.txt
+++ b/PySide/QtScript/CMakeLists.txt
@@ -51,4 +51,7 @@ add_dependencies(QtScript QtCore)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScript${CMAKE_DEBUG_POSTFIX}.so DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/pyside_qtscript_python.h
DESTINATION include/PySide/QtScript/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_script.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtScriptTools/CMakeLists.txt b/PySide/QtScriptTools/CMakeLists.txt
index 1d53ff7b..d937d663 100644
--- a/PySide/QtScriptTools/CMakeLists.txt
+++ b/PySide/QtScriptTools/CMakeLists.txt
@@ -37,4 +37,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtScriptTools${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools/pyside_qtscripttools_python.h
DESTINATION include/PySide/QtScriptTools/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_scripttools.xml
+ DESTINATION share/PySide/typesystems)
diff --git a/PySide/QtSql/CMakeLists.txt b/PySide/QtSql/CMakeLists.txt
index 8040f01c..1cbe713c 100644
--- a/PySide/QtSql/CMakeLists.txt
+++ b/PySide/QtSql/CMakeLists.txt
@@ -49,4 +49,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSql${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/pyside_qtsql_python.h
DESTINATION include/PySide/QtSql/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_sql.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt
index 42129c7c..631131a2 100644
--- a/PySide/QtSvg/CMakeLists.txt
+++ b/PySide/QtSvg/CMakeLists.txt
@@ -61,3 +61,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtSvg${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/pyside_qtsvg_python.h
DESTINATION include/PySide/QtSvg/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_svg.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt
index e6e29536..2d392e42 100644
--- a/PySide/QtTest/CMakeLists.txt
+++ b/PySide/QtTest/CMakeLists.txt
@@ -49,3 +49,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtTest${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/pyside_qttest_python.h
DESTINATION include/PySide/QtTest/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_test.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtUiTools/CMakeLists.txt b/PySide/QtUiTools/CMakeLists.txt
index eaea4141..5809c3f3 100644
--- a/PySide/QtUiTools/CMakeLists.txt
+++ b/PySide/QtUiTools/CMakeLists.txt
@@ -36,4 +36,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtUiTools${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools/pyside_qtuitools_python.h
DESTINATION include/PySide/QtUiTools/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_uitools.xml
+ DESTINATION share/PySide/typesystems)
diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt
index 09f5bfa1..7bdf6e02 100644
--- a/PySide/QtWebKit/CMakeLists.txt
+++ b/PySide/QtWebKit/CMakeLists.txt
@@ -79,3 +79,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtWebKit${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/pyside_qtwebkit_python.h
DESTINATION include/PySide/QtWebKit/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_webkit.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtXml/CMakeLists.txt b/PySide/QtXml/CMakeLists.txt
index 6ee39d7e..e6b4e809 100644
--- a/PySide/QtXml/CMakeLists.txt
+++ b/PySide/QtXml/CMakeLists.txt
@@ -62,4 +62,7 @@ add_dependencies(QtXml QtCore)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXml${CMAKE_DEBUG_POSTFIX}.so DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml/pyside_qtxml_python.h
DESTINATION include/PySide/QtXml/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_xml.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/PySide/QtXmlPatterns/CMakeLists.txt b/PySide/QtXmlPatterns/CMakeLists.txt
index 73c6e1dc..df673728 100644
--- a/PySide/QtXmlPatterns/CMakeLists.txt
+++ b/PySide/QtXmlPatterns/CMakeLists.txt
@@ -50,4 +50,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/QtXmlPatterns${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns/pyside_qtxmlpatterns_python.h
DESTINATION include/PySide/QtXmlPatterns/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_xmlpatterns.xml
+ DESTINATION share/PySide/typesystems)
diff --git a/PySide/phonon/CMakeLists.txt b/PySide/phonon/CMakeLists.txt
index 73920638..1b2f05f5 100644
--- a/PySide/phonon/CMakeLists.txt
+++ b/PySide/phonon/CMakeLists.txt
@@ -71,3 +71,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon${CMAKE_DEBUG_POSTFIX}.so
DESTINATION ${SITE_PACKAGE}/PySide)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/pyside_phonon_python.h
DESTINATION include/PySide/phonon/)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_phonon.xml
+ DESTINATION share/PySide/typesystems)
+
diff --git a/libpyside/PySideConfig.cmake.in b/libpyside/PySideConfig.cmake.in
index f3023642..1d9c9aeb 100644
--- a/libpyside/PySideConfig.cmake.in
+++ b/libpyside/PySideConfig.cmake.in
@@ -1,5 +1,7 @@
# PYSIDE_INCLUDE_DIR - Directories to include to use PySide
# PYSIDE_LIBRARIES - Files to link against to use PySide
+# PYSIDE_TYPESYSTEMS - Type system files that should be used by other bindings extending PySide
SET(PYSIDE_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PySide")
SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@CMAKE_SHARED_LIBRARY_SUFFIX@")
+SET(PYSIDE_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/shared/PySide/typesystems")
diff --git a/libpyside/pyside.pc.in b/libpyside/pyside.pc.in
index 61cb8080..ca7a0a5e 100644
--- a/libpyside/pyside.pc.in
+++ b/libpyside/pyside.pc.in
@@ -2,6 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
libdir=@LIB_INSTALL_DIR@
includedir=@CMAKE_INSTALL_PREFIX@/include/PySide
+typesystemdir=@CMAKE_INSTALL_PREFIX@/share/PySide/typesystems
Name: PySide
Description: Support library for Python bindings of Qt-based libraries.