diff options
| author | renatofilho <renato.filho@openbossa.org> | 2010-09-20 19:02:16 -0300 |
|---|---|---|
| committer | renatofilho <renato.filho@openbossa.org> | 2010-09-20 19:21:33 -0300 |
| commit | 2a225be9c770ccf774a97457ab409b6b3f60b467 (patch) | |
| tree | 9cc2838c3c1ae1827fc23ba05291c02e6318b4cc /libpyside | |
| parent | f8a12b7577773f6a02804e1e60920a964f5e01ca (diff) | |
Use CMAKE_<CONFIG>_POSTFIX on config files, used for cmake and pkgconfig.
Fixes bug #286.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'libpyside')
| -rw-r--r-- | libpyside/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | libpyside/PySideConfig.cmake.in | 2 | ||||
| -rw-r--r-- | libpyside/pyside.pc.in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libpyside/CMakeLists.txt b/libpyside/CMakeLists.txt index 11196f831..20bd03ac2 100644 --- a/libpyside/CMakeLists.txt +++ b/libpyside/CMakeLists.txt @@ -42,6 +42,12 @@ set(libpyside_HEADERS qproperty.h ) +if (CMAKE_BUILD_TYPE STREQUAL "Debug") + set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_DEBUG_POSTFIX}) +else() + set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_RELEASE_POSTFIX}) +endif() + # create pkg-config file configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pyside.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/pyside${pyside_SUFFIX}.pc" @ONLY) diff --git a/libpyside/PySideConfig.cmake.in b/libpyside/PySideConfig.cmake.in index 9e0f42e9d..654e6a3fe 100644 --- a/libpyside/PySideConfig.cmake.in +++ b/libpyside/PySideConfig.cmake.in @@ -3,5 +3,5 @@ # 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@@CMAKE_SHARED_LIBRARY_SUFFIX@") +SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@") SET(PYSIDE_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFFIX@/typesystems") diff --git a/libpyside/pyside.pc.in b/libpyside/pyside.pc.in index 516f8e1eb..f58c53720 100644 --- a/libpyside/pyside.pc.in +++ b/libpyside/pyside.pc.in @@ -7,6 +7,6 @@ typesystemdir=@CMAKE_INSTALL_PREFIX@/share/PySide@pyside_SUFFIX@/typesystems 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@ +Libs: -L${libdir} -lpython -lpyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@ Cflags: -I${includedir} |