[SCM] Paraview packaging branch, master, updated. upstream/3.10.1-66-g34c442d

[Mathieu Malaterre]

The following commit has been merged in the master branch:
commit 34c442d81ef382b0ddf2ecb8feb02643982a0037
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date:   Wed Sep 7 10:20:45 2011 +0200

    d/rules changes:
     - add --parallel flags
     - remove -lXt from global C*FLAGS
     - add doc for CMAKE_SKIP_RPATH value to OFF
     - Explicitely set MPI libs values
     - Activate AdiosReader & EyeDomeLighting plugin

diff --git a/debian/rules b/debian/rules
index 7b905d5..ff98785 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,26 @@ BUILDDIR = $(CURDIR)/debian/build
 DESTDIR = $(CURDIR)/debian/tmp
 
 %:
-	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with=python2
+	dh $@ --parallel --buildsystem=cmake --builddirectory=$(BUILDDIR) --with=python2
 
 export LD_LIBRARY_PATH+=:$(CURDIR)/debian/paraview/usr/lib/paraview
 
-# -lXt is added for compiling not in clean environment. It gives an error without it.
-CFLAGS := -Wall -lXt $(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS := -Wall -lXt $(shell dpkg-buildflags --get CXXFLAGS)
+# http://lists.alioth.debian.org/pipermail/debian-science-maintainers/2011-June/008157.html
+# cmake will inspect those settings automatically:
+export CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
+export CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
+export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
+# CMAKE_SKIP_RPATH=OFF is important otherwise documentation generation will fails with:
+# vtkSMExtractDocumentation: error while loading shared libraries: libvtkPVServerManager.so:
+# No rule to make target `Documentation/ParaViewWriters.html', needed by `Documentation/paraview.qhp'.  Stop.
+
+# Explicit settings of MPI_* is required see
+# http://www.vtk.org/Bug/view.php?id=12572
 PYVER = $(shell pyversions -dv)
 extra_flags += 	-DPARAVIEW_GENERATE_PROXY_DOCUMENTATION=ON \
+	-DCMAKE_SKIP_RPATH=OFF \
 	-DBUILD_SHARED_LIBS=ON \
 	-DVTK_USE_SYSTEM_FREETYPE=ON \
 	-DVTK_USE_SYSTEM_JPEG=ON \
@@ -39,16 +49,17 @@ extra_flags += 	-DPARAVIEW_GENERATE_PROXY_DOCUMENTATION=ON \
 	-DVTK_USE_POSTGRES=ON \
 	-DVTK_USE_N_WAY_ARRAYS=ON \
 	-DPARAVIEW_USE_MPI=ON \
-	-DMPI_INCLUDE_PATH=/usr/include/mpi \
+	-DMPI_INCLUDE_PATH="/usr/include/mpi" \
+	-DMPI_LIBRARY="/usr/lib/libmpi.so" \
+	-DMPI_EXTRA_LIBRARY="/usr/lib/libmpi++.so" \
 	-DPARAVIEW_USE_SYSTEM_HDF5=ON \
 	-DHDF5_ENABLE_PARALLEL=ON \
 	-DVTK_USE_SYSTEM_HDF5=ON \
-	-DMPI_LINK_FLAGS=-Wl \
 	-DPARAVIEW_ENABLE_PYTHON=ON \
 	-DVTK_USE_OGGTHEORA_ENCODER=ON \
 	-DVTK_USE_SYSTEM_OGGTHEORA=ON \
-	-DCMAKE_C_FLAGS='$(CFLAGS)' \
-	-DCMAKE_CXX_FLAGS='$(CXXFLAGS)' \
+	-DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \
+	-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON \
 
 
 override_dh_auto_configure:
@@ -67,5 +78,8 @@ override_dh_auto_install:
 	dh_auto_install -- DESTDIR=$(DESTDIR)
 	chmod a+x $(DESTDIR)/usr/lib/paraview/testing/FindString.tcl
 
+override_dh_install:
+	dh_install --list-missing
+
 override_dh_makeshlibs:
 

-- 
Paraview packaging