Changeset 24811

Timestamp:

05/06/20 20:20:56 (5 years ago)

Author:

jdquinn

Message:

CHG: Cleanup of GSL install scripts for Linux

Location:

issm/trunk-jpl

Files:

• jenkins/ross-debian_linux-codipack (modified) (1 diff)
• jenkins/ross-debian_linux-dakota (modified) (1 diff)
• m4/issm_options.m4 (modified) (1 diff)

issm/trunk-jpl/jenkins/ross-debian_linux-codipack

@@ -39 +39 @@
         cmake           install.sh
         petsc           install-3.12-linux.sh
-        gsl                     install-1.15-linux.sh
+        gsl                     install-linux.sh
         triangle        install-linux.sh
         chaco           install.sh

issm/trunk-jpl/jenkins/ross-debian_linux-dakota

@@ -40 +40 @@
         cmake           install.sh
         petsc           install-3.12-linux.sh
-        gsl                     install-1.15-linux.sh
+        gsl                     install-linux.sh
         boost           install-1.55-linux.sh
         dakota          install-6.2-linux.sh

issm/trunk-jpl/m4/issm_options.m4

@@ -606 +606 @@
                                         if test "${BOOST_VERSION_MAJOR}" == "1"; then
                                                 DAKOTAFLAGS="-DHAVE_CONFIG_H -DHAVE_CONFIG_H -DDISABLE_DAKOTA_CONFIG_H -DBOOST_DISABLE_ASSERTS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DHAVE_ADAPTIVE_SAMPLING -DHAVE_ESM -DHAVE_QUESO -DHAVE_QUESO_GPMSA -DHAVE_CONMIN -DHAVE_DDACE -DHAVE_DREAM -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_NOMAD -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
-                                                DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lqueso -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver -L${BOOST_ROOT}/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system ${BLASLAPACKLIB}"
+                                                DAKOTALIB="-L${DAKOTA_ROOT}/lib -ldakota_src -ldakota_src_fortran -lnidr -lteuchos -lpecos -lpecos_src -llhs -llhs_mods -llhs_mod -ldfftpack -lsparsegrid -lsurfpack -lsurfpack -lsurfpack_fortran -lqueso -lconmin -lddace -ldream -lfsudace -lhopspack -lncsuopt -lcport -lnomad -loptpp -lpsuade -lamplsolver"
+                                                if test "${BOOST_VERSION_MINOR}" == "55"; then
+                                                        DAKOTALIB+=" -L${BOOST_ROOT}/lib -lboost_serialization -lboost_signals -lboost_regex -lboost_filesystem -lboost_system ${BLASLAPACKLIB}"
+                                                elif test "${BOOST_VERSION_MINOR}" = "72"; then
+                                                        DAKOTALIB+=" -L${BOOST_ROOT}/lib -lboost_filesystem -lboost_program_options -lboost_regex -lboost_serialization -lboost_system"
+                                                fi
+                                                DAKOTALIB+=" ${BLASLAPACKLIB}"
                                         fi
                                         AC_DEFINE([DISABLE_DAKOTA_CONFIG_H], [1], [disabling DAKOTA_CONFIG_H])