Author: smr
Date: 2010-12-23 03:22:47 +0000 (Thu, 23 Dec 2010)
New Revision: 5615
Added:
trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch
Modified:
trunk/packages/insighttoolkit/trunk/debian/changelog
trunk/packages/insighttoolkit/trunk/debian/patches/series
trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Add wrapitk.patch.
Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog 2010-12-23
03:21:43 UTC (rev 5614)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog 2010-12-23
03:22:47 UTC (rev 5615)
@@ -1,3 +1,10 @@
+insighttoolkit (3.20.0-5) experimental; urgency=low
+
+ * patches/wrapitk.patch: New. Use ITK_LIBRARY_PROPERTIES to properly
+ version libSwigRuntime{Python,Java,Tcl}.
+
+ -- Steve M. Robbins <[email protected]> Wed, 22 Dec 2010 21:20:57 -0600
+
insighttoolkit (3.20.0-4) experimental; urgency=low
* rules: Really remove parallel build (don't set DEB_BUILD_PARALLEL).
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series 2010-12-23
03:21:43 UTC (rev 5614)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2010-12-23
03:22:47 UTC (rev 5615)
@@ -4,3 +4,4 @@
tcl-install.patch
jni-dir.patch
remove-cmake-export-build-settings.patch
+wrapitk.patch
Added: trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch
(rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch
2010-12-23 03:22:47 UTC (rev 5615)
@@ -0,0 +1,15 @@
+--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/SwigRuntime/CMakeLists.txt
++++ insighttoolkit-3.20.0/Wrapping/WrapITK/SwigRuntime/CMakeLists.txt
+@@ -13,7 +13,11 @@
+ ENDIF(CMAKE_SYSTEM MATCHES "SunOS-." AND CMAKE_COMPILER_IS_GNUCXX AND
CMAKE_COMPILER_IS_GNUCC)
+
+ INSTALL_TARGETS("${WRAP_ITK_INSTALL_PREFIX}/lib" ${lib_name})
+- SET_TARGET_PROPERTIES(${lib_name} PROPERTIES LINK_FLAGS
"${CSWIG_EXTRA_LINKFLAGS}")
++ IF(ITK_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES LINK_FLAGS
"${CSWIG_EXTRA_LINKFLAGS}" ${ITK_LIBRARY_PROPERTIES})
++ ELSE(ITK_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${lib_name} PROPERTIES LINK_FLAGS
"${CSWIG_EXTRA_LINKFLAGS}")
++ ENDIF(ITK_LIBRARY_PROPERTIES)
+
+ ADD_CUSTOM_COMMAND(
+ SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/swigrun.h
Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules 2010-12-23 03:21:43 UTC
(rev 5614)
+++ trunk/packages/insighttoolkit/trunk/debian/rules 2010-12-23 03:22:47 UTC
(rev 5615)
@@ -132,7 +132,7 @@
dh_pysupport -p$(pkg_python)
install/$(pkg_tcl)::
- dh_install -p$(pkg_tcl) --autodest debian/tmp/usr/bin/itkwish
debian/tmp/usr/lib/InsightToolkit/WrapITK/bin/itkwish
+ dh_install -p$(pkg_tcl)
debian/tmp/usr/lib/InsightToolkit/WrapITK/bin/itkwish usr/bin
dh_install -p$(pkg_tcl)
debian/tmp/usr/lib/InsightToolkit/WrapITK/lib/*Tcl.so* usr/lib
dh_install -p$(pkg_tcl) debian/tmp/usr/lib/InsightToolkit/WrapITK/Tcl/*
$(TCLMODDIR)
dh_installman -p$(pkg_tcl) debian/itkwish.1
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
