[SCM] Paraview packaging branch, master, updated. upstream/3.10.1-76-g026fa3d
Anton Gladky
gladky.anton at gmail.com
Wed Sep 7 19:38:53 UTC 2011
The following commit has been merged in the master branch:
commit 026fa3d9ef0dcabb8505eee28b6e0a9fe4713be2
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Wed Sep 7 21:38:38 2011 +0200
Cosmetic changes. Revert CMakeLists.txt.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0023d1a..fa8ef0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,7 @@ SET(PARAVIEW_QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE})
# Check that the Git submodules have been initialized correctly, and the local
# Git hooks have been installed.
-#INCLUDE(ParaViewCheckSourceTree)
+INCLUDE(ParaViewCheckSourceTree)
INCLUDE(ParaViewMacros)
INCLUDE(ParaViewCommon)
diff --git a/debian/rules b/debian/rules
index be14f49..e2a4d38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,8 @@ 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 += -DPARAVIEW_GENERATE_PROXY_DOCUMENTATION=ON \
+extra_flags += \
+ -DPARAVIEW_GENERATE_PROXY_DOCUMENTATION=ON \
-DCMAKE_SKIP_RPATH=OFF \
-DBUILD_SHARED_LIBS=ON \
-DVTK_USE_SYSTEM_FREETYPE=ON \
@@ -62,7 +63,6 @@ extra_flags += -DPARAVIEW_GENERATE_PROXY_DOCUMENTATION=ON \
-DPARAVIEW_BUILD_PLUGIN_AdiosReader:BOOL=ON \
-DPARAVIEW_BUILD_PLUGIN_EyeDomeLighting:BOOL=ON \
-
override_dh_auto_configure:
dh_auto_configure -- $(extra_flags)
--
Paraview packaging
More information about the debian-science-commits
mailing list