Changeset 18304

Timestamp:

07/30/14 15:11:18 (11 years ago)

Author:

schlegel

Message:

CHG: update dakota to build statically

Location:

issm/trunk-jpl/externalpackages/dakota

Files:

• configs/5.3.1/BuildDakotaCustom.cmake.mac.patch (added)
• configs/5.3.1/CMakeLists.txt.patch (added)
• install-5.3.1-macosx64.sh (modified) (2 diffs)

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

@@ -23 +23 @@
 export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
-patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/5.3.1/BuildDakotaCustom.cmake.patch
+patch $DAK_SRC/cmake/BuildDakotaCustom.cmake configs/5.3.1/BuildDakotaCustom.cmake.mac.patch
 patch $DAK_SRC/cmake/DakotaDev.cmake configs/5.3.1/DakotaDev.cmake.patch
+patch $DAK_SRC/CMakeLists.txt configs/5.3.1/CMakeLists.txt.patch
 
 #Apply patches
@@ -33 +34 @@
 patch src/packages/pecos/src/pecos_global_defs.hpp configs/5.3.1/pecos_global_defs.hpp.patch
 
+export BOOST_ROOT=$ISSM_DIR/externalpackages/boost/install
+
 #Configure dakota
+# Set your local gcc compiler here
 cd $DAK_BUILD
-cmake -D CMAKE_C_COMPILER=/usr/local/gfortran/bin/x86_64-apple-darwin10-gcc -D CMAKE_CXX_COMPILER=/usr/local/gfortran/bin/x86_64-apple-darwin10-g++ -D CMAKE_Fortran_COMPILER=/usr/local/gfortran/bin/x86_64-apple-darwin10-gfortran -C $DAK_SRC/cmake/BuildDakotaCustom.cmake -C $DAK_SRC/cmake/DakotaDev.cmake $DAK_SRC
+cmake -DBoost_NO_BOOST_CMAKE=TRUE \
+    -DBoost_NO_SYSTEM_PATHS=TRUE \
+    -DBOOST_ROOT:PATHNAME=$BOOST_ROOT \
+    -DBoost_LIBRARY_DIRS:FILEPATH=${BOOST_ROOT}/lib \
+         -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CC_COMPILER=gcc \
+    -C $DAK_SRC/cmake/BuildDakotaCustom.cmake -C $DAK_SRC/cmake/DakotaDev.cmake $DAK_SRC
+
+#-DCMAKE_CXX_COMPILER=/usr/local/gfortran/bin/x86_64-apple-darwin10-g++ -DCMAKE_Fortran_COMPILER=/usr/local/gfortran/bin/x86_64-apple-darwin10-gfortran
+
 cd ..