[med-svn] r17358 - trunk/packages/vtk-dicom/trunk/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2014-06-30 12:51:43 +0000 (Mon, 30 Jun 2014)
New Revision: 17358

Added:
   trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch
Modified:
   trunk/packages/vtk-dicom/trunk/debian/patches/series
Log:
fix underlinking

Modified: trunk/packages/vtk-dicom/trunk/debian/patches/series
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/series	2014-06-30 12:32:19 UTC (rev 17357)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/series	2014-06-30 12:51:43 UTC (rev 17358)
@@ -1 +1,2 @@
 51c53d2537d4fefec5c3e7b8545609079723e112.patch
+underlink.patch

Added: trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch
===================================================================
--- trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch	                        (rev 0)
+++ trunk/packages/vtk-dicom/trunk/debian/patches/underlink.patch	2014-06-30 12:51:43 UTC (rev 17358)
@@ -0,0 +1,31 @@
+Description: fix underlinking issues
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
+Index: vtk-dicom-0.5.0/CMakeLists.txt
+===================================================================
+--- vtk-dicom-0.5.0.orig/CMakeLists.txt	2014-06-30 14:45:22.210110459 +0200
++++ vtk-dicom-0.5.0/CMakeLists.txt	2014-06-30 14:45:34.274111183 +0200
+@@ -334,6 +334,7 @@
+ 
+ # Wrappers
+ if(BUILD_PYTHON_WRAPPERS)
++  find_package(PythonLibs REQUIRED)
+   set(vtk-module ${LIB_NAME})
+   set(XY) # Get python version, e.g. 27 for python 2.7
+   if(vtkPython_LIBRARIES)
+@@ -370,10 +371,12 @@
+     VERSION "${DICOM_VERSION}" SOVERSION "${DICOM_SHORT_VERSION}"
+     OUTPUT_NAME "${LIB_PYTHON_OUTPUT_NAME}")
+   target_link_libraries(${LIB_PYTHON_NAME} ${LIB_NAME} ${LIB_PYTHON_LIBS})
++  #message(${PYTHON_LIBRARY})
++  target_link_libraries(${LIB_PYTHON_NAME} vtkPythonCore ${PYTHON_LIBRARY})
+   # On Win32 and Mac, link python library now, on UNIX, don't
+-  if(WIN32 OR APPLE)
++  #if(WIN32 OR APPLE)
+     target_link_libraries(${LIB_PYTHON_NAME} ${VTK_PYTHON_LIBRARIES})
+-  endif()
++  #endif()
+   if(USE_DCMTK AND DCMTK_charls_LIBRARY)
+     target_link_libraries(${LIB_PYTHON_NAME} ${DCMTK_charls_LIBRARY})
+   endif()