Changeset 27567


Ignore:
Timestamp:
02/11/23 14:52:36 (2 years ago)
Author:
jdquinn
Message:

CHG: Removed dependencies on specific installation of HDF5; typo; cleanup

Location:
issm/trunk-jpl
Files:
5 deleted
30 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/gdal/install-3-python-static.sh

    r27565 r27567  
    1616export CXXFLAGS="-std=c++11"
    1717export CXX=mpicxx
    18 export LDFLAGS="-L${HDF5_ROOT}/lib" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
    19 export LIBS="-lsqlite3 -lhdf5_hl -lhdf5" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
     18export LIBS="-lsqlite3 -lhdf5_hl -lhdf5"
    2019export PREFIX="${ISSM_DIR}/externalpackages/gdal/install" # Need this to properly set destination root for Python libraries on macOS (should not affect Linux build; do not need for this configuration, but including it for consistency)
    2120
    … …  
    4544        --with-python="python3" \
    4645        --with-curl="${CURL_ROOT}/bin/curl-config" \
    47         --with-hdf5="${HDF5_ROOT}" \
    4846        --with-jpeg=internal \
    4947        --with-libz="${ZLIB_ROOT}" \

  • issm/trunk-jpl/externalpackages/gdal/install-3-python.sh

    r27541 r27567  
    3535        --enable-fast-install \
    3636        --with-python="python3" \
    37         --with-hdf5="${HDF5_ROOT}" \
    3837        --with-libz="${ZLIB_ROOT}" \
    3938        --with-netcdf="${NETCDF_ROOT}" \

  • issm/trunk-jpl/externalpackages/gdal/install-3-static.sh

    r27565 r27567  
    1616export CXXFLAGS="-std=c++11"
    1717export CXX=mpicxx
    18 export LDFLAGS="-L${HDF5_ROOT}/lib" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
    19 export LIBS="-lsqlite3 -lhdf5_hl -lhdf5" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
     18export LIBS="-lsqlite3 -lhdf5_hl -lhdf5"
    2019export PREFIX="${ISSM_DIR}/externalpackages/gdal/install" # NOTE: Need to export this to properly set destination root for Python libraries on macOS (should not affect Linux build). Set to location where external package should be installed.
    2120
    … …  
    4443        --with-pic \
    4544        --with-curl="${CURL_ROOT}/bin/curl-config" \
    46         --with-hdf5="${HDF5_ROOT}" \
    4745        --with-jpeg=internal \
    4846        --with-libz="${ZLIB_ROOT}" \

  • issm/trunk-jpl/externalpackages/gdal/install-3.sh

    r27541 r27567  
    3030        --prefix="${PREFIX}" \
    3131        --enable-fast-install \
    32         --with-hdf5="${HDF5_ROOT}" \
    3332        --with-libz="${ZLIB_ROOT}" \
    3433        --with-netcdf="${NETCDF_ROOT}" \

  • issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindGDAL.cmake

    r27565 r27567  
    150150                ${NETCDF_ROOT}
    151151                $ENV{NETCDF_ROOT}
    152                 ${HDF5_ROOT}
    153                 $ENV{HDF5_ROOT}
    154152                ${ZLIB_ROOT}
    155153                $ENV{ZLIB_ROOT}

  • issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindNETCDF.cmake

    r27565 r27567  
    115115                NAMES ${_extralib}
    116116                HINTS
    117                 ${HDF5_ROOT}
    118                 $ENV{HDF5_ROOT}
    119117                ${ZLIB_ROOT}
    120118                $ENV{ZLIB_ROOT}

  • issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh

    r27541 r27567  
    6767        -DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a" \
    6868        -DGDAL_EXTRA_LIBS="${GDAL_EXTRA_LIBS}" \
    69         -DHDF5_ROOT="${HDF5_ROOT}" \
    7069        -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
    7170        -DNETCDF_EXTRA_LIBS="${NETCDF_EXTRA_LIBS}" \

  • issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh

    r27565 r27567  
    6767        -DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a" \
    6868        -DGDAL_EXTRA_LIBS="${GDAL_EXTRA_LIBS}" \
    69         -DHDF5_ROOT="${HDF5_ROOT}" \
    7069        -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
    7170        -DNETCDF_EXTRA_LIBS="${NETCDF_EXTRA_LIBS}" \

  • issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-static-with_tests.sh

    r25860 r27567  
    3232export CPPFLAGS="-I${ZLIB_ROOT}/include"
    3333
    34 export HDF5LIB="${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a"
    3534export ZLIB="${ZLIB_ROOT}/lib/libz.a"
    3635

  • issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-static.sh

    r25860 r27567  
    3232export CPPFLAGS="-I${ZLIB_ROOT}/include"
    3333
    34 export HDF5LIB="${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a"
    3534export ZLIB="${ZLIB_ROOT}/lib/libz.a"
    3635

  • issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-with_tests.sh

    r25860 r27567  
    2222#
    2323export CC=mpicc
    24 export CPPFLAGS="-I${CURL_ROOT}/include -I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include"
    25 export LDFLAGS="-L${CURL_ROOT}/lib -L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib"
     24export CPPFLAGS="-I${CURL_ROOT}/include -I${ZLIB_ROOT}/include"
     25export LDFLAGS="-L${CURL_ROOT}/lib -L${ZLIB_ROOT}/lib"
    2626
    2727# Download source

  • issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel.sh

    r25860 r27567  
    2222#
    2323export CC=mpicc
    24 export CPPFLAGS="-I${CURL_ROOT}/include -I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include"
    25 export LDFLAGS="-L${CURL_ROOT}/lib -L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib"
     24export CPPFLAGS="-I${CURL_ROOT}/include -I${ZLIB_ROOT}/include"
     25export LDFLAGS="-L${CURL_ROOT}/lib -L${ZLIB_ROOT}/lib"
    2626
    2727# Download source

  • issm/trunk-jpl/externalpackages/netcdf/install-4.7-with_tests.sh

    r25860 r27567  
    2121# Environment
    2222#
    23 export CPPFLAGS="-I${CURL_ROOT}/include -I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include"
    24 export LDFLAGS="-L${CURL_ROOT}/lib -L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib"
     23export CPPFLAGS="-I${CURL_ROOT}/include -I${ZLIB_ROOT}/include"
     24export LDFLAGS="-L${CURL_ROOT}/lib -L${ZLIB_ROOT}/lib"
    2525
    2626# Download source

  • issm/trunk-jpl/externalpackages/netcdf/install-4.7.sh

    r25860 r27567  
    2121# Environment
    2222#
    23 export CPPFLAGS="-I${CURL_ROOT}/include -I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include"
    24 export LDFLAGS="-L${CURL_ROOT}/lib -L${HDF5_ROOT}/lib -L${ZLIB_ROOT}/lib"
     23export CPPFLAGS="-I${CURL_ROOT}/include -I${ZLIB_ROOT}/include"
     24export LDFLAGS="-L${CURL_ROOT}/lib -L${ZLIB_ROOT}/lib"
    2525
    2626# Download source

  • issm/trunk-jpl/jenkins/linux64_caladan

    r27456 r27567  
    3939#-----------------------------------#
    4040
    41 #List of external pakages to be installed and their installation scripts
     41#List of external packages to be installed and their installation scripts
    4242EXTERNALPACKAGES="autotools     install.sh
    4343                                                cmake        install.sh

  • issm/trunk-jpl/jenkins/linux64_caladan_ad

    r26102 r27567  
    2929#-----------------------------------#
    3030
    31 #List of external pakages to be installed and their installation scripts
     31#List of external packages to be installed and their installation scripts
    3232EXTERNALPACKAGES="
    3333        autotools       install-linux.sh

  • issm/trunk-jpl/jenkins/linux64_caladan_ampi

    r26102 r27567  
    3939#-----------------------------------#
    4040
    41 #List of external pakages to be installed and their installation scripts
     41#List of external packages to be installed and their installation scripts
    4242EXTERNALPACKAGES="
    4343        autotools               install-linux.sh

  • issm/trunk-jpl/jenkins/mac-intel-basic

    r27552 r27567  
    3131#-------------------#
    3232
    33 # List of external pakages to be installed and their installation scripts
     33# List of external packages to be installed and their installation scripts
    3434EXTERNALPACKAGES="
    3535        autotools       install-mac.sh

  • issm/trunk-jpl/jenkins/mac-intel-dakota

    r27564 r27567  
    4343#-------------------#
    4444
    45 #List of external pakages to be installed and their installation scripts
     45#List of external packages to be installed and their installation scripts
    4646EXTERNALPACKAGES="
    4747        autotools       install-mac.sh

  • issm/trunk-jpl/jenkins/mac-intel-solid_earth

    r27564 r27567  
    4343#-------------------#
    4444
    45 #List of external pakages to be installed and their installation scripts
     45#List of external packages to be installed and their installation scripts
    4646EXTERNALPACKAGES="
    4747        autotools       install-mac.sh

  • issm/trunk-jpl/jenkins/mac-silicon-basic

    r27542 r27567  
    4040#-------------------#
    4141
    42 # List of external pakages to be installed and their installation scripts
     42# List of external packages to be installed and their installation scripts
    4343EXTERNALPACKAGES="
    4444        autotools       install-mac.sh

  • issm/trunk-jpl/jenkins/pine_island-mac-basic

    r27456 r27567  
    3131#-------------------#
    3232
    33 # List of external pakages to be installed and their installation scripts
     33# List of external packages to be installed and their installation scripts
    3434EXTERNALPACKAGES="
    3535        autotools       install-mac.sh

  • issm/trunk-jpl/jenkins/pine_island-mac-dakota

    r27456 r27567  
    4242#-------------------#
    4343
    44 #List of external pakages to be installed and their installation scripts
     44#List of external packages to be installed and their installation scripts
    4545EXTERNALPACKAGES="
    4646        autotools       install-mac.sh

  • issm/trunk-jpl/jenkins/pine_island-mac-solid_earth

    r27456 r27567  
    4242#-------------------#
    4343
    44 #List of external pakages to be installed and their installation scripts
     44#List of external packages to be installed and their installation scripts
    4545EXTERNALPACKAGES="
    4646        autotools       install-mac.sh

  • issm/trunk-jpl/jenkins/pine_island-mac-solid_earth-lambert

    r27456 r27567  
    4242#-------------------#
    4343
    44 #List of external pakages to be installed and their installation scripts
     44#List of external packages to be installed and their installation scripts
    4545EXTERNALPACKAGES="
    4646        autotools       install-mac.sh

  • issm/trunk-jpl/jenkins/ross-win-msys2-gcc-msmpi-basic

    r27554 r27567  
    2323#-------------------#
    2424
    25 #List of external pakages to be installed and their installation scripts
     25#List of external packages to be installed and their installation scripts
    2626EXTERNALPACKAGES="
    2727        metis           install-5-win-msys2-gcc.sh

  • issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic

    r26765 r27567  
    2828#-------------------#
    2929
    30 #List of external pakages to be installed and their installation scripts
     30#List of external packages to be installed and their installation scripts
    3131EXTERNALPACKAGES="
    3232        msmpi           install.sh

  • issm/trunk-jpl/jenkins/windows

    r26102 r27567  
    3737#-----------------------------------#
    3838
    39 #List of external pakages to be installed and their installation scripts
     39#List of external packages to be installed and their installation scripts
    4040EXTERNALPACKAGES="
    4141        autotools   install-win.sh

  • issm/trunk-jpl/jenkins/windows-par

    r26102 r27567  
    3535#-----------------------------------#
    3636
    37 #List of external pakages to be installed and their installation scripts
     37#List of external packages to be installed and their installation scripts
    3838EXTERNALPACKAGES="autotools   install-win.sh
    3939                                                petsc       install-dev-win10-par.sh

  • issm/trunk-jpl/jenkins/windows_static

    r26102 r27567  
    3737#-----------------------------------#
    3838
    39 #List of external pakages to be installed and their installation scripts
     39#List of external packages to be installed and their installation scripts
    4040EXTERNALPACKAGES="autotools   install-win.sh
    4141                                        petsc       install-3.6-win10.sh
Note: See TracChangeset for help on using the changeset viewer.