[med-svn] r5617 - in trunk/packages/insighttoolkit/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2010-12-23 05:32:51 +0000 (Thu, 23 Dec 2010)
New Revision: 5617

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch
Log:
Use ITK_LIBRARY_PROPERTIES to properly version the Tcl shared libs.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2010-12-23 03:27:38 UTC (rev 5616)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2010-12-23 05:32:51 UTC (rev 5617)
@@ -1,11 +1,12 @@
 insighttoolkit (3.20.0-5) experimental; urgency=low
 
   * patches/wrapitk.patch: New.  Use ITK_LIBRARY_PROPERTIES to properly
-    version libSwigRuntime{Python,Java,Tcl}.
+    version libSwigRuntime{Python,Java,Tcl} and the Tcl shared libs (which
+    are installed in /usr/lib).
 
   * rules: Install libSwigJava into /usr/lib.
 
- -- Steve M. Robbins <smr at debian.org>  Wed, 22 Dec 2010 21:27:18 -0600
+ -- Steve M. Robbins <smr at debian.org>  Wed, 22 Dec 2010 23:32:20 -0600
 
 insighttoolkit (3.20.0-4) experimental; urgency=low
 

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch	2010-12-23 03:27:38 UTC (rev 5616)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/wrapitk.patch	2010-12-23 05:32:51 UTC (rev 5617)
@@ -13,3 +13,18 @@
  
    ADD_CUSTOM_COMMAND(
     SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/swigrun.h
+--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/CreateWrapperLibrary.cmake
++++ insighttoolkit-3.20.0/Wrapping/WrapITK/CreateWrapperLibrary.cmake
+@@ -502,7 +502,11 @@
+     SET_TARGET_PROPERTIES(${library_name} PROPERTIES COMPILE_FLAGS -wd191 )
+   ENDIF(CMAKE_CXX_COMPILER MATCHES "icpc")
+ 
+-  SET_TARGET_PROPERTIES(${library_name} PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}")
++  IF(ITK_LIBRARY_PROPERTIES AND "${language}" STREQUAL "Tcl")
++    SET_TARGET_PROPERTIES(${library_name} PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}")
++  ELSE(ITK_LIBRARY_PROPERTIES AND "${language}" STREQUAL "Tcl")
++    SET_TARGET_PROPERTIES(${library_name} PROPERTIES LINK_FLAGS "${CSWIG_EXTRA_LINKFLAGS}")
++  ENDIF(ITK_LIBRARY_PROPERTIES AND "${language}" STREQUAL "Tcl")
+   TARGET_LINK_LIBRARIES(${library_name} 
+     ${WRAPPER_LIBRARY_LINK_LIBRARIES} 
+     ${SWIG_RUNTIME_LANGUAGE}