[SCM] Paraview packaging branch, master, updated. upstream/3.10.1-80-g16bdc77

[Mathieu Malaterre]

The following commit has been merged in the master branch:
commit 16bdc77b1beaf0104d85a4d52c86b134bf755e07
Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Date:   Tue Sep 13 16:37:44 2011 +0000

    Fix issue with kwProcessXML

diff --git a/debian/patches/kwprocessxml_rpath.patch b/debian/patches/kwprocessxml_rpath.patch
new file mode 100644
index 0000000..488c086
--- /dev/null
+++ b/debian/patches/kwprocessxml_rpath.patch
@@ -0,0 +1,24 @@
+This patch forces building of kwProcessXML as shared forwarded executable
+in our case (even is CMAKE_SKIP_RPATH is OFF in debian)
+Index: paraview/Common/KWCommon/CMakeLists.txt
+===================================================================
+--- paraview.orig/Common/KWCommon/CMakeLists.txt	2011-09-13 16:33:23.000000000 +0000
++++ paraview/Common/KWCommon/CMakeLists.txt	2011-09-13 16:33:35.000000000 +0000
+@@ -225,7 +225,7 @@
+ IF(KWCOMMON_BUILD_PROCESSXML)
+   # For shared libraries on non-windows systems use the KWSys shared-forward
+   # implementation to make sure shared libraries are found.
+-  IF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
++  IF(BUILD_SHARED_LIBS )
+     IF(NOT WIN32)
+       SET(KWCommon_FORWARD_DIR_BUILD ${EXECUTABLE_OUTPUT_PATH})
+       SET(KWCommon_FORWARD_BIN_TO_LIB "..${KWCommon_INSTALL_LIB_DIR}")
+@@ -248,7 +248,7 @@
+           COMPONENT Development)
+       ENDIF(NOT KWCommon_INSTALL_NO_DEVELOPMENT)
+     ENDIF(NOT WIN32)
+-  ENDIF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH)
++  ENDIF(BUILD_SHARED_LIBS )
+ 
+   ADD_EXECUTABLE(kwProcessXML${KWCommon_EXE_SUFFIX} ProcessXML.cxx)
+   TARGET_LINK_LIBRARIES(kwProcessXML${KWCommon_EXE_SUFFIX} vtkCommon vtksys)
diff --git a/debian/patches/series b/debian/patches/series
index 81836d2..6b74403 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ paraview-fix-libav07-compat.patch
 fix_vtkxdmf_xt.patch
 removesqlite.patch
 install_htmldoc.patch
+kwprocessxml_rpath.patch
diff --git a/debian/rules b/debian/rules
index e2a4d38..3ec5e75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,10 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 # Explicit settings of MPI_* is required see
 # http://www.vtk.org/Bug/view.php?id=12572
 PYVER = $(shell pyversions -dv)
-extra_flags += \
+extra_flags += -Wno-dev \
 	-DPARAVIEW_GENERATE_PROXY_DOCUMENTATION=ON \
+	-DCMAKE_INSTALL_RPATH=/usr/lib/paraview \
+	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF  \
 	-DCMAKE_SKIP_RPATH=OFF \
 	-DBUILD_SHARED_LIBS=ON \
 	-DVTK_USE_SYSTEM_FREETYPE=ON \

-- 
Paraview packaging