Changeset 23428

Timestamp:

10/16/18 09:54:06 (6 years ago)

Author:

jdquinn

Message:

ADD: Patch for Mac OSX Dakota build

Location:

issm/trunk-jpl/externalpackages/dakota

Files:

• configs/6.2/InstallDarwinDylibs.cmake.patch (added)
• install-6.2-macosx64.sh (modified) (3 diffs)

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

@@ -23 +23 @@
 
 # Set up Dakota and CMake variables
-export DAK_PATH=$ISSM_DIR/externalpackages/dakota
+DAK_PATH=$ISSM_DIR/externalpackages/dakota
 
 export DAK_BUILD=$DAK_PATH/build
@@ -35 +35 @@
 patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/$DAK_VER/BuildDakotaCustom.cmake.mac.patch
 patch $DAK_SRC/cmake/DakotaDev.cmake configs/$DAK_VER/DakotaDev.cmake.patch
+patch $DAK_SRC/cmake/InstallDarwinDylibs.cmake configs/$DAK_VER/InstallDarwinDylibs.cmake.patch
 patch $DAK_SRC/CMakeLists.txt configs/$DAK_VER/CMakeLists.txt.patch
 patch src/src/NonDSampling.cpp configs/$DAK_VER/NonDSampling.cpp.patch
@@ -54 +55 @@
         -DCMAKE_Fortran_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpif77 \
         -DCMAKE_CXX_FLAGS=-fdelayed-template-parsing \
-        -DDAKOTA_JENKINS_BUILD=TRUE \
         -DHAVE_ACRO=off \
         -DHAVE_JEGA=off \