Changeset 23414

Timestamp:

10/11/18 15:25:34 (6 years ago)

Author:

jdquinn

Message:

CHG: Attempt at fixing false failure on installation of Dakota

File:

• issm/trunk-jpl/externalpackages/dakota/install-6.2-macosx64.sh (modified) (5 diffs)

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

@@ -4 +4 @@
 #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.py 'http://issm.jpl.nasa.gov/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
 
@@ -20 +20 @@
 
 #Set up Dakota cmake variables and config
-export DAK_SRC=$ISSM_DIR/externalpackages/dakota/src
-export DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
+DAK_BUILD=$ISSM_DIR/externalpackages/dakota/build
+DAK_INSTALL=$ISSM_DIR/externalpackages/dakota/install
+DAK_SRC=$ISSM_DIR/externalpackages/dakota/src
 export MPIHOME=$ISSM_DIR/externalpackages/mpich/install
 cp $DAK_SRC/cmake/BuildDakotaTemplate.cmake $DAK_SRC/cmake/BuildDakotaCustom.cmake
@@ -42 +43 @@
         -DBOOST_ROOT:PATHNAME=$BOOST_ROOT \
         -DBoost_LIBRARY_DIRS:FILEPATH=${BOOST_ROOT}/lib \
+        -DCMAKE_INSTALL_PREFIX=${DAK_INSTALL} \
         -D CMAKE_C_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicc \
         -D CMAKE_CXX_COMPILER=$ISSM_DIR/externalpackages/mpich/install/bin/mpicxx \
@@ -51 +53 @@
         -C $DAK_SRC/cmake/DakotaDev.cmake \
         $DAK_SRC
-cd ..
 
 # Snowleopard: Mpi should be made with these compilers
@@ -58 +59 @@
 
 #Compile and install dakota
-cd $DAK_BUILD
 if [ $# -eq 0 ];
 then
         make
+        cd test && ctest -L Accept
         make install
 else
         make -j $1
+        cd test && ctest -j $1 -L Accept
         make -j $1 install
 fi
-cd ..
+