[Python-modules-commits] r14669 - in packages/shiboken/trunk/debian/patches (1 file)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Tue Oct 19 19:47:13 UTC 2010
Date: Tuesday, October 19, 2010 @ 19:47:02
Author: odyx-guest
Revision: 14669
Update allowCustomShibokenPostfix.patch
Modified:
packages/shiboken/trunk/debian/patches/allowCustomShibokenPostfix.patch
Modified: packages/shiboken/trunk/debian/patches/allowCustomShibokenPostfix.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/allowCustomShibokenPostfix.patch 2010-10-19 19:46:22 UTC (rev 14668)
+++ packages/shiboken/trunk/debian/patches/allowCustomShibokenPostfix.patch 2010-10-19 19:47:02 UTC (rev 14669)
@@ -2,11 +2,11 @@
Author: Didier Raboud <didier at raboud.com>
Origin: vendor
Forwarded: not needed (distribution specific)
-Last-Update: 2010-09-11
+Last-Update: 2010-10-14
Index: shiboken/data/ShibokenConfig.cmake.in
===================================================================
---- shiboken.orig/data/ShibokenConfig.cmake.in 2010-09-10 16:46:57.000000000 +0200
-+++ shiboken/data/ShibokenConfig.cmake.in 2010-09-11 10:39:00.000000000 +0200
+--- shiboken.orig/data/ShibokenConfig.cmake.in 2010-10-14 14:20:00.000000000 +0200
++++ shiboken/data/ShibokenConfig.cmake.in 2010-10-14 14:23:00.000000000 +0200
@@ -1,11 +1,16 @@
# SHIBOKEN_INCLUDE_DIR - Directories to include to use SHIBOKEN
# SHIBOKEN_LIBRARIES - Files to link against to use SHIBOKEN
@@ -18,10 +18,12 @@
+
SET(SHIBOKEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/shiboken at shiboken_SUFFIX@")
if(MSVC)
- SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX at .lib")
+- SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@@LIBRARY_OUTPUT_SUFFIX at .lib")
++ SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@${SHIBOKEN_POSTFIX}@LIBRARY_OUTPUT_SUFFIX at .lib")
elseif(WIN32)
- SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
+- SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
++ SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@${SHIBOKEN_POSTFIX}@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
else()
-- SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
-+ SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@${SHIBOKEN_POSTFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@")
+- SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
++ SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at shiboken@shiboken_SUFFIX@${SHIBOKEN_POSTFIX}@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
endif()
More information about the Python-modules-commits
mailing list