Fix a bug where boost and deal.II would pick different version of zlib and a bug...

diff --git a/deal.II/packages/dealii-prepare.package b/deal.II/packages/dealii-prepare.package
index ea502dc84e4d775273ade04ec46485b4b205fbc5..9f86854bb41af4385ab1b3b84fa3f4e164df9f7f 100644 (file)
--- a/deal.II/packages/dealii-prepare.package
+++ b/deal.II/packages/dealii-prepare.package
@@ -34,7 +34,7 @@ PACKAGES_OFF=${PACKAGES_OFF,,}
 #########################################################################
 TRILINOS_CONFOPTS=" \
 -D BLAS_LIBRARY_DIRS:STRING=${BLAS_DIR} \
--D LAPACK_LIBRARY_DIRS:STRING=${LAPACK_LIBRARY_DIRS} \
+-D LAPACK_LIBRARY_DIRS:STRING=${LAPACK_DIR} \
 "
 
 if [[ ${MKL} == ON ]]; then

diff --git a/deal.II/packages/trilinos.package b/deal.II/packages/trilinos.package
index 6461679def194b3da3397a5bbadd97ee544d49d4..e6748c467191eb11ca63e466c113af944e2b22bf 100644 (file)
--- a/deal.II/packages/trilinos.package
+++ b/deal.II/packages/trilinos.package
@@ -7,7 +7,8 @@ CHECKSUM=26a07a4fe43e49a8208953dea5ab2652
 # 11.10.2 CHECKSUM=37bbbb30756e9cb2d35c092954d2f1eb
 BUILDCHAIN=cmake
 
-CONFOPTS="-D Trilinos_ENABLE_OpenMP:BOOL=OFF \
+CONFOPTS="${TRILINOS_CONFOPTS} \
+          -D Trilinos_ENABLE_OpenMP:BOOL=OFF \
           -D TPL_ENABLE_TBB:BOOL=OFF \
           -D Trilinos_ENABLE_Didasko:BOOL=ON \
           -D Trilinos_ENABLE_Sacado:BOOL=ON \

diff --git a/deal.II/packages/zlib.package b/deal.II/packages/zlib.package
index a4137debba2f6131e36df03812e0a809689dbcb0..5e590ab311926f53bb889c958f899cc0b0ae84a4 100644 (file)
--- a/deal.II/packages/zlib.package
+++ b/deal.II/packages/zlib.package
@@ -13,4 +13,6 @@ package_specific_build () {
        
 package_specific_register () {
     export ZLIB_DIR=${INSTALL_PATH}/
+    export ZLIB_INCLUDE=${INSTALL_PATH}/include
+    export ZLIB_LIBPATH=${INSTALL_PATH}/lib
 }