Changeset 19553

Timestamp:

Sep 16, 2015, 2:18:31 PM (11 years ago)

Author:

schlegel

Message:

CHG: linux needs shared library mpi in dakota

Location:

issm/trunk-jpl/externalpackages/dakota

Files:

• configs/6.1-mpi/BuildDakotaCustom.cmake.patch (modified) (1 diff)
• configs/6.1-mpi/BuildDakotaCustom.cmake.yosemite.patch (added)
• install-6.1-mpi-linux64.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/dakota/configs/6.1-mpi/BuildDakotaCustom.cmake.patch

@@ -6 +6 @@
 >  CACHE FILEPATH "Use installed MPI headers" FORCE)
 > set( MPI_LIBRARY
->  "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.a"
+>  "$ENV{ISSM_DIR}/externalpackages/mpich/install/lib/libmpich.so"
 >  CACHE FILEPATH "Use installed MPI library" FORCE)
 73,77c73,77

issm/trunk-jpl/externalpackages/dakota/install-6.1-mpi-linux64.sh

@@ -33 +33 @@
 patch src/src/NonDSampling.cpp configs/6.1/NonDSampling.cpp.patch
 patch src/src/NonDLocalReliability.cpp configs/6.1/NonDLocalReliability.cpp.patch
-#patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.1/pecos_global_defs.hpp.patch
+patch src/packages/pecos/src/pecos_global_defs.hpp configs/6.1/pecos_global_defs.hpp.patch
 
 #Configure dakota