r47156 - in /packages/fenics/dolfin/trunk/debian: changelog rules

[johannr-guest at users.alioth.debian.org]

Author: johannr-guest
Date: Thu Oct 29 11:15:57 2015
New Revision: 47156

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47156
Log:
- Explicitly disable petsc4py, slepc4py and sphinx.
- Help CMake find the parallel version of hdf5.


Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/rules

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=47156&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog	(original)
+++ packages/fenics/dolfin/trunk/debian/changelog	Thu Oct 29 11:15:57 2015
@@ -13,6 +13,8 @@
   * debian/rules:
     - Replace swig with swig3.0.
     - Set PETSC_DIR to /usr/lib/petsc and SLEPC_DIR to /usr/lib/slepc.
+    - Explicitly disable petsc4py, slepc4py and sphinx.
+    - Help CMake find the parallel version of hdf5.
 
  -- Johannes Ring <johannr at simula.no>  Wed, 28 Oct 2015 09:41:00 +0100
 

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=47156&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules	(original)
+++ packages/fenics/dolfin/trunk/debian/rules	Thu Oct 29 11:15:57 2015
@@ -30,13 +30,17 @@
 	-D CMAKE_SKIP_RPATH:BOOL=ON \
 	-D CMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF \
 	-D DOLFIN_ENABLE_TRILINOS:BOOL=OFF \
-	-D DOLFIN_ENABLE_CGAL:BOOL=ON \
 	-D DOLFIN_ENABLE_HDF5:BOOL=ON \
+	-D HDF5_C_COMPILER_EXECUTABLE:FILEPATH=/usr/bin/h5pcc \
+	-D HDF5_Fortran_COMPILER_EXECUTABLE:FILEPATH=/usr/bin/h5pfc \
 	-D DOLFIN_ENABLE_VTK:BOOL=ON \
 	-D DOLFIN_ENABLE_QT:BOOL=ON \
 	-D DOLFIN_ENABLE_PARMETIS:BOOL=OFF \
 	-D DOLFIN_ENABLE_PASTIX:BOOL=OFF \
 	-D DOLFIN_ENABLE_SCOTCH:BOOL=OFF \
+	-D DOLFIN_ENABLE_PETSC4PY:BOOL=OFF \
+	-D DOLFIN_ENABLE_SLEPC4PY:BOOL=OFF \
+	-D DOLFIN_ENABLE_SPHINX:BOOL=OFF \
 	-D DOLFIN_ENABLE_UNIT_TESTS:BOOL=OFF \
 	-D SWIG_EXECUTABLE:FILEPATH=/usr/bin/swig \
         -D DOLFIN_ENABLE_MPI:BOOL=$(ENABLE_MPI) \