Index: /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.petsclibs.patch
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.petsclibs.patch	(revision 24371)
+++ /issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.petsclibs.patch	(revision 24372)
@@ -3,4 +3,4 @@
 ---
 > # TODO: Can't this be integrated into the following logic?
-> set(BLAS_LIBS "-L$ENV{ISSM_DIR}/externalpackages/petsc/install/lib -lfblas -L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran")
-> set(LAPACK_LIBS "-L$ENV{ISSM_DIR}/externalpackages/petsc/install/lib -lflapack -L/usr/lib/gcc/x86_64-linux-gnu/4.9 -lgfortran")
+> set(BLAS_LIBS $ENV{BLAS_LIBS})
+> set(LAPACK_LIBS $ENV{LAPACK_LIBS})
Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64-static.sh	(revision 24371)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64-static.sh	(revision 24372)
@@ -2,8 +2,10 @@
 set -eu
 
+
 # Constants
-DAK_VER="6.2"
+#
+VER="6.2"
 
-#Some cleanup
+# Cleanup
 rm -rf Dakota
 rm -rf src
@@ -13,12 +15,12 @@
 
 #Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.sh https://issm.ess.uci.edu/files/externalpackages/dakota-${DAK_VER}-public.src.tar.gz dakota-${DAK_VER}-public-src.tar.gz
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/dakota-${VER}-public.src.tar.gz" "dakota-${VER}-public-src.tar.gz"
 
 #Untar
-tar -zxvf dakota-${DAK_VER}-public-src.tar.gz
+tar -zxvf dakota-${VER}-public-src.tar.gz
 
 #Move Dakota to src directory
-mv dakota-${DAK_VER}.0.src/* src
-rm -rf dakota-${DAK_VER}.0.src
+mv dakota-${VER}.0.src/* src
+rm -rf dakota-${VER}.0.src
 
 #Set up Dakota cmake variables and config
@@ -30,14 +32,17 @@
 export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
 export BOOST_ROOT=$ISSM_DIR/externalpackages/boost/install
+export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure that external packages also find it
+export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure thatss is as an option to CMake to ensure that external packages also find it
+
 
 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
-patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/${DAK_VER}/BuildDakotaCustom.cmake.patch
-patch $DAK_SRC/cmake/DakotaDev.cmake configs/${DAK_VER}/DakotaDev.cmake.patch
-patch $DAK_SRC/CMakeLists.txt configs/${DAK_VER}/CMakeLists.txt.petsclibs.patch
+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/${VER}/BuildDakotaCustom.cmake.patch
+patch $DAK_SRC/cmake/DakotaDev.cmake configs/${VER}/DakotaDev.cmake.patch
+patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.petsclibs.patch
 
 #Apply patches
-patch src/src/NonDSampling.cpp configs/${DAK_VER}/NonDSampling.cpp.patch
-patch src/src/NonDLocalReliability.cpp configs/${DAK_VER}/NonDLocalReliability.cpp.patch
-patch src/packages/pecos/src/pecos_global_defs.hpp configs/${DAK_VER}/pecos_global_defs.hpp.patch
+patch src/src/NonDSampling.cpp configs/${VER}/NonDSampling.cpp.patch
+patch src/src/NonDLocalReliability.cpp configs/${VER}/NonDLocalReliability.cpp.patch
+patch src/packages/pecos/src/pecos_global_defs.hpp configs/${VER}/pecos_global_defs.hpp.patch
 
 #Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost
@@ -47,22 +52,24 @@
 cd $DAK_BUILD
 
-cmake -C$DAK_SRC/cmake/BuildDakotaCustom.cmake \
-		-C$DAK_SRC/cmake/DakotaDev.cmake \
-		-DBUILD_STATIC_LIBS=ON \
-		-DBUILD_SHARED_LIBS=OFF \
-		-DBOOST_ROOT=$BOOST_ROOT \
-		-DBoost_LIBRARY_DIRS=$BOOST_ROOT/lib \
-		-DBoost_NO_BOOST_CMAKE=TRUE \
-		-DBoost_NO_SYSTEM_PATHS=TRUE \
-		-DBoost_INSTALL_PREFIX=$DAK_INSTALL \
-		-DCMAKE_C_FLAGS="-O2 -g -fPIC" \
-		-DCMAKE_CXX_FLAGS="-O2 -g -fPIC" \
-		-DCMAKE_Fortran_FLAGS="-O2 -g -fPIC" \
-		-DCMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
-		-DCMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
-		-DCMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
-		-DHAVE_ACRO=off \
-		-DHAVE_JEGA=off \
-		$DAK_SRC
+cmake \
+	-DBUILD_STATIC_LIBS=ON \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DBoost_INSTALL_PREFIX=$DAK_INSTALL \
+	-DBOOST_ROOT=$BOOST_ROOT \
+	-DBoost_NO_BOOST_CMAKE=TRUE \
+	-DBoost_LIBRARY_DIRS=$BOOST_ROOT/lib \
+	-DBoost_NO_SYSTEM_PATHS=TRUE \
+	-DCMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
+	-DCMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
+	-DCMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
+	-DCMAKE_C_FLAGS="-O2 -g -fPIC" \
+	-DCMAKE_CXX_FLAGS="-O2 -g -fPIC" \
+	-DCMAKE_Fortran_FLAGS="-O2 -g -fPIC" \
+	-DHAVE_ACRO=off \
+	-DHAVE_JEGA=off \
+	-C$DAK_SRC/cmake/BuildDakotaCustom.cmake \
+	-C$DAK_SRC/cmake/DakotaDev.cmake \
+	$DAK_SRC
+
 cd ..
 
Index: /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64.sh	(revision 24371)
+++ /issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64.sh	(revision 24372)
@@ -4,13 +4,13 @@
 #Some cleanup
 rm -rf Dakota
-rm -rf src 
-rm -rf build 
-rm -rf install 
-mkdir src build install 
+rm -rf src
+rm -rf build
+rm -rf install
+mkdir src build install
 
 #Download from ISSM server
 $ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/dakota-6.2-public.src.tar.gz' 'dakota-6.2-public-src.tar.gz'
 
-#Untar 
+#Untar
 tar -zxvf dakota-6.2-public-src.tar.gz
 
@@ -23,4 +23,6 @@
 export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
 export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
+export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -lblas" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure that external packages also find it
+export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/lapack/install/lib -llapack" # Need to export BLAS_LIBS *and* pass is as an option to CMake to ensure that
 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch