Author: malat Date: 2013-07-18 09:08:32 +0000 (Thu, 18 Jul 2013) New Revision: 14177
Modified: trunk/packages/gdcm/trunk/debian/rules Log: Final touch Modified: trunk/packages/gdcm/trunk/debian/rules =================================================================== --- trunk/packages/gdcm/trunk/debian/rules 2013-07-17 15:55:40 UTC (rev 14176) +++ trunk/packages/gdcm/trunk/debian/rules 2013-07-18 09:08:32 UTC (rev 14177) @@ -38,14 +38,6 @@ PYMODDIR := /usr/lib/$(shell pyversions -r) VTKVERS=$(shell apt-cache policy libvtk5-dev | grep "Installed:" | cut -d: -f2 | cut -d' ' -f2 | cut -d- -f1 | cut -d. -f1-2) -PYTHON_INCLUDE_DIRS=$(shell python-config --includes | cut -f1 -d' '|cut -c3-) -PYTHON_INCLUDE_DIR="$(PYTHON_INCLUDE_DIRS)" -# See bug #709181 -PYTHON_INCLUDE_DIRS2=$(shell python-config --includes | cut -f2 -d' '|cut -c3-) -PYTHON_INCLUDE_DIR2="$(PYTHON_INCLUDE_DIRS2)" -PYTHON_CONFIG_DIR=$(shell python-config --configdir) -PYTHON_LIBRARY="$(PYTHON_CONFIG_DIR)/libpython2.7.so" - # GDCM_DOCUMENTATION:BOOL=ON is required to build man page (build target) # Need to make sure to build using the same vtk/python version: CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \ @@ -73,9 +65,7 @@ -DGDCM_USE_SYSTEM_POPPLER:BOOL=ON \ -DGDCM_USE_PARAVIEW:BOOL=OFF \ -DGDCM_USE_ACTIVIZ:BOOL=ON \ - -DPYTHON_INCLUDE_DIR=$(PYTHON_INCLUDE_DIR) \ - -DPYTHON_INCLUDE_DIR2=$(PYTHON_INCLUDE_DIR2) \ - -DPYTHON_LIBRARY=$(PYTHON_LIBRARY) \ + -DPython_ADDITIONAL_VERSIONS=$(PYVER) \ -DGDCM_INSTALL_DOC_DIR:STRING=share/doc/gdcm-doc \ -DTAGFILES:STRING="/usr/share/doc/vtk-doc/html/vtk$(VTKVERS).tag=/usr/share/doc/vtk-doc/html/" \ -DGDCM_USE_VTK:BOOL=ON @@ -88,7 +78,7 @@ override_dh_auto_install: # See #664188 - sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/gdcm-2.2/GDCMTargets-relwithdebinfo.cmake + sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/gdcm-2.2/GDCMTargets-noconfig.cmake # See #711214 sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/gdcm-2.2/GDCMTargets.cmake dh_auto_install _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit