From: Bruno Turcksin <bruno.turcksin@gmail.com>
Date: Wed, 22 Jul 2015 15:19:48 +0000 (-0500)
Subject: Fix a bug where boost and deal.II would pick different version of zlib and a bug... 
X-Git-Tag: v0.5~1^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22e2e39aa01084c9bd7eb5f010c159b03a54b245;p=candi.git

Fix a bug where boost and deal.II would pick different version of zlib and a bug where Lapack was not picked up correctly.
---

diff --git a/deal.II/packages/dealii-prepare.package b/deal.II/packages/dealii-prepare.package
index ea502dc..9f86854 100644
--- 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 6461679..e6748c4 100644
--- 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 a4137de..5e590ab 100644
--- 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
 }