Changeset 24520

Timestamp:

01/14/20 16:41:50 (5 years ago)

Author:

schlegel

Message:

CHG: add install for using petsc blas lapack, rename patch that uses set library variables

Location:

issm/trunk-jpl/externalpackages/dakota

Files:

• configs/6.2/CMakeLists.txt.libvars.patch (added)
• configs/6.2/CMakeLists.txt.petsclibs.patch (modified) (1 diff)
• install-6.2-linux64-petsclibs.sh (added)
• install-6.2-linux64.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/dakota/configs/6.2/CMakeLists.txt.petsclibs.patch

@@ -3 +3 @@
 ---
 > # TODO: Can't this be integrated into the following logic?
-> set(BLAS_LIBS $ENV{BLAS_LIBS})
-> set(LAPACK_LIBS $ENV{LAPACK_LIBS})
+> 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")

issm/trunk-jpl/externalpackages/dakota/install-6.2-linux64.sh

@@ -28 +28 @@
 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/6.2/BuildDakotaCustom.cmake.patch
 patch $DAK_SRC/cmake/DakotaDev.cmake configs/6.2/DakotaDev.cmake.patch
-patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.petsclibs.patch
+patch $DAK_SRC/CMakeLists.txt configs/6.2/CMakeLists.txt.libvars.patch
 
 #Apply patches