summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2011-10-06 18:18:49 -0300
committerRenato Filho <renato.filho@openbossa.org>2011-10-06 18:18:49 -0300
commitd41aff3062adbe3981f65575b544d4c9fd98689d (patch)
treeb0b2f50d7e4e56b18d630be7314015f6e0c8c3ba
parent229d076650978e55173a764cbfa73b9f6e389eea (diff)
downloadpyside-d41aff3062adbe3981f65575b544d4c9fd98689d.tar.gz
pyside-d41aff3062adbe3981f65575b544d4c9fd98689d.tar.xz
pyside-d41aff3062adbe3981f65575b544d4c9fd98689d.zip
Updated Cmake files.
-rw-r--r--libpyside/PySideConfig-spec.cmake.in2
-rw-r--r--libpyside/PySideConfig.cmake.in2
-rw-r--r--libpyside/pyside.pc.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/libpyside/PySideConfig-spec.cmake.in b/libpyside/PySideConfig-spec.cmake.in
index b017b9e..57ccd31 100644
--- a/libpyside/PySideConfig-spec.cmake.in
+++ b/libpyside/PySideConfig-spec.cmake.in
@@ -4,6 +4,6 @@
# 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@-@SHIBOKEN_PYTHON_BASENAME@@CMAKE_SHARED_LIBRARY_SUFFIX@")
+SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
SET(PYSIDE_PYTHONPATH "@SITE_PACKAGE@")
SET(PYSIDE_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFIX@/typesystems")
diff --git a/libpyside/PySideConfig.cmake.in b/libpyside/PySideConfig.cmake.in
index f25487c..b83c48b 100644
--- a/libpyside/PySideConfig.cmake.in
+++ b/libpyside/PySideConfig.cmake.in
@@ -2,4 +2,4 @@ if (NOT PYTHON_BASENAME)
message(STATUS "Using default python: @PYTHON_BASENAME@")
SET(PYTHON_BASENAME @PYTHON_BASENAME@)
endif()
-include(@LIB_INSTALL_DIR@/cmake/PySide-@BINDING_API_VERSION@/PySideConfig-${PYTHON_BASENAME}.cmake)
+include(@LIB_INSTALL_DIR@/cmake/PySide-@BINDING_API_VERSION@/PySideConfig${SHIBOKEN_PYTHON_SUFFIX}.cmake)
diff --git a/libpyside/pyside.pc.in b/libpyside/pyside.pc.in
index 75dfff8..7d5e68c 100644
--- a/libpyside/pyside.pc.in
+++ b/libpyside/pyside.pc.in
@@ -8,7 +8,7 @@ pythonpath=@SITE_PACKAGE@
Name: PySide@pyside_SUFFIX@
Description: Support library for Python bindings of Qt-based libraries.
Version: @BINDING_API_VERSION_FULL@
-Libs: -L${libdir} -lpyside@pyside_SUFFIX@-@SHIBOKEN_PYTHON_BASENAME@@LIBRARY_OUTPUT_SUFFIX@
+Libs: -L${libdir} -lpyside@pyside_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
Cflags: -I${includedir}
Requires: shiboken