summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2010-10-20 16:32:14 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2010-10-22 16:19:24 -0300
commit76fa1124908009ec1eaab0960dd542d6cc0e2c66 (patch)
treec99a6d2001166a7735cedbb70f120da0467836de
parent8e1e25a631d3e697ea795d66c8ed7e8fbbf7c6dd (diff)
downloadpyside-76fa1124908009ec1eaab0960dd542d6cc0e2c66.tar.gz
pyside-76fa1124908009ec1eaab0960dd542d6cc0e2c66.tar.xz
pyside-76fa1124908009ec1eaab0960dd542d6cc0e2c66.zip
Fixes to libpyside pkg-config and cmake files.
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org> Reviewed by Renato Ara├║jo <renato.filho@openbossa.org>
-rw-r--r--libpyside/PySideConfig.cmake.in4
-rw-r--r--libpyside/pyside.pc.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/libpyside/PySideConfig.cmake.in b/libpyside/PySideConfig.cmake.in
index 654e6a3..b5b73dc 100644
--- a/libpyside/PySideConfig.cmake.in
+++ b/libpyside/PySideConfig.cmake.in
@@ -1,7 +1,9 @@
# PYSIDE_INCLUDE_DIR - Directories to include to use PySide
-# PYSIDE_LIBRARIES - Files to link against to use PySide
+# PYSIDE_LIBRARY - Files to link against to use PySide
+# PYSIDE_PYTHONPATH - Path to where the PySide Python module files could be found
# PYSIDE_TYPESYSTEMS - Type system files that should be used by other bindings extending PySide
SET(PYSIDE_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PySide@pyside_SUFFIX@")
SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
+SET(PYSIDE_PYTHONPATH "@SITE_PACKAGE@")
SET(PYSIDE_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFFIX@/typesystems")
diff --git a/libpyside/pyside.pc.in b/libpyside/pyside.pc.in
index f58c537..f7458a9 100644
--- a/libpyside/pyside.pc.in
+++ b/libpyside/pyside.pc.in
@@ -3,10 +3,12 @@ exec_prefix=@CMAKE_INSTALL_PREFIX@
libdir=@LIB_INSTALL_DIR@
includedir=@CMAKE_INSTALL_PREFIX@/include/PySide@pyside_SUFFIX@
typesystemdir=@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFIX@/typesystems
+pythonpath=@SITE_PACKAGE@
Name: PySide@pyside_SUFFIX@
Description: Support library for Python bindings of Qt-based libraries.
Version: @BINDING_API_VERSION@
-Libs: -L${libdir} -lpython -lpyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
+Libs: -L${libdir} -lpyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
Cflags: -I${includedir}
+Requires: shiboken