![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 28166
- Timestamp:
- 03/21/24 21:13:20 (13 months ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 4 edited
-
externalpackages/gmt/configs/6.5/static/mac/cmake/ConfigUserAdvancedTemplate.cmake.patch (modified) (3 diffs)
-
externalpackages/gmt/install-6-mac-static.sh (modified) (4 diffs)
-
packagers/mac/complete-issm-mac-intel-binaries-matlab.sh (modified) (1 diff)
-
packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/externalpackages/gmt/configs/6.5/static/mac/cmake/ConfigUserAdvancedTemplate.cmake.patch
r28161 r28166 1 1 --- src/cmake/ConfigUserAdvancedTemplate.cmake 2024-01-07 01:32:40 2 +++ ConfigUserAdvancedTemplate.cmake 2024-03-19 13:14:04 3 @@ -39,19 +39,19 @@ 4 ## Section 1: Installation paths 5 ## 6 # Set install name suffix used for directories and gmt executables [undefined]: 7 -#set (GMT_INSTALL_NAME_SUFFIX "suffix") 8 +set (CMAKE_INSTALL_PREFIX "$ENV{PREFIX}") 9 10 # Install into traditional directory structure. Disable to install a 11 # distribution type directory structure (doc and share separated) [on]: 2 +++ ./ConfigUserAdvancedTemplate.cmake 2024-03-21 20:02:18 3 @@ -46,12 +46,12 @@ 12 4 #set (GMT_INSTALL_TRADITIONAL_FOLDERNAMES OFF) 13 5 … … 30 22 # to nc-config) [auto]: 31 23 -#set (NETCDF_ROOT "netcdf_install_prefix") 32 + set (NETCDF_ROOT "$ENV{NETCDF_ROOT}")24 +#set (NETCDF_ROOT "$ENV{NETCDF_ROOT}") 33 25 34 26 # Set location of GDAL (can be root directory, path to header file or path to 35 27 # gdal-config) [auto]: 36 28 -#set (GDAL_ROOT "gdal_install_prefix") 37 + set (GDAL_ROOT "$ENV{GDAL_ROOT}")29 +#set (GDAL_ROOT "$ENV{GDAL_ROOT}") 38 30 39 31 # Set location of GEOS (can be root directory, path to header file or path to … … 44 36 # Set location of ZLIB (can be root directory or path to header file) [auto]: 45 37 -#set (ZLIB_ROOT "zlib_install_prefix") 46 + set (ZLIB_ROOT "$ENV{ZLIB_ROOT}")38 +#set (ZLIB_ROOT "$ENV{ZLIB_ROOT}") 47 39 48 40 # Set location of CURL (can be root directory or path to header file) [auto]: -
issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh
r28165 r28166 6 6 # 7 7 VER="6.5.0" 8 9 PREFIX="${ISSM_DIR}/externalpackages/gmt/install" 8 10 9 11 # Find certain libraries so we do not have to hardcode them … … 22 24 23 25 GDAL_EXTRA_LIBS="-lc++" # `$GDAL_ROOT/bin/gdal-config --dep-libs` does not report need to link to libc++ (see also customized configuration file ./configs/6/static/cmake/modules/FindGDAL.cmake) 24 NETCDF_EXTRA_LIBS="-lpthread -ldl -liconv" # `$NETCDF_ROOT/bin/nc-config --libs` does not report certain dependencies of certain static libraries (see also customized configuration file ./configs/ 6/static/cmake/modules/FindNETCDF.cmake)26 NETCDF_EXTRA_LIBS="-lpthread -ldl -liconv" # `$NETCDF_ROOT/bin/nc-config --libs` does not report certain dependencies of certain static libraries (see also customized configuration file ./configs/${VER%.*}/static/cmake/modules/FindNETCDF.cmake) 25 27 26 28 # Environment … … 30 32 export CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;${ZLIB_ROOT}/lib/libz.a" 31 33 export LDFLAGS="-lsqlite3 -framework CoreFoundation -framework Security" 32 export PREFIX="${ISSM_DIR}/externalpackages/gmt/install" # NOTE: Need to export this to be picked up by customized ConfigUser.cmake (see below). Set to location where external package should be installed.33 34 34 35 # Download source … … 68 69 # 69 70 cmake \ 71 -DCMAKE_INSTALL_PREFIX="${PREFIX}" \ 70 72 -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \ 71 73 -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \ -
issm/trunk-jpl/packagers/mac/complete-issm-mac-intel-binaries-matlab.sh
r28147 r28166 64 64 ## Constants 65 65 # 66 MATLAB_NROPTIONS="'benchmark','all','exclude',[124,125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,200 6,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded66 MATLAB_NROPTIONS="'benchmark','all','exclude',[124,125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2005,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded 67 67 MATLAB_PATH="/Applications/MATLAB_R2023b.app" 68 68 PKG="ISSM-macOS-Intel-MATLAB" # Name of directory to copy distributable files to -
issm/trunk-jpl/packagers/mac/complete-issm-mac-silicon-binaries-matlab.sh
r28147 r28166 64 64 ## Constants 65 65 # 66 MATLAB_NROPTIONS="'benchmark','all','exclude',[124,125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,200 6,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded66 MATLAB_NROPTIONS="'benchmark','all','exclude',[124,125,126,129,234,235,418,420,435,444,445,456,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2005,2006,2007,2008,2010,2011,2012,2013,2020,2021,2051,2052,2053,2084,2085,2090,2091,2092,2101,2424,2425,3001:3300,3480,3481,4001:4100]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded 67 67 MATLAB_PATH="/Applications/MATLAB_R2023b.app" 68 68 PKG="ISSM-macOS-Silicon-MATLAB" # Name of directory to copy distributable files to
Note:
See TracChangeset
for help on using the changeset viewer.
