source: issm/oecreview/Archive/27032-27229/ISSM-27150-27151.diff@ 27230

Index: ../trunk-jpl/etc/environment.sh
===================================================================
--- ../trunk-jpl/etc/environment.sh     (revision 27150)
+++ ../trunk-jpl/etc/environment.sh     (revision 27151)
@@ -468,11 +468,11 @@
 NETCDF_ROOT="${ISSM_EXT_DIR}/netcdf/install"
 if [ -d "${NETCDF_ROOT}" ]; then
        export NETCDF_ROOT # Used in installation of GDAL, GMT
-       path_append "${NETCDF_ROOT}/bin"
-       cpath_append "${NETCDF_ROOT}/include"
-       library_path_append "${NETCDF_ROOT}/lib"
-       dyld_library_path_append "${NETCDF_ROOT}/lib"
-       ld_library_path_append "${NETCDF_ROOT}/lib"
+       path_prepend "${NETCDF_ROOT}/bin"
+       cpath_prepend "${NETCDF_ROOT}/include"
+       library_path_prepend "${NETCDF_ROOT}/lib"
+       dyld_library_path_prepend "${NETCDF_ROOT}/lib"
+       ld_library_path_prepend "${NETCDF_ROOT}/lib"
 fi
 
 NETCDF_CXX_ROOT="${ISSM_EXT_DIR}/netcdf-cxx/install"
@@ -490,8 +490,9 @@
 CURL_ROOT="${ISSM_EXT_DIR}/curl/install"
 if [ -d "${CURL_ROOT}" ]; then
        export CURL_ROOT # Used in installation of NetCDF, GDAL, GMT
-       ld_library_path_append "${CURL_ROOT}/lib"
-       dyld_library_path_append "${CURL_ROOT}/lib"
+       cpath_prepend "${CURL_ROOT}/include"
+       ld_library_path_prepend "${CURL_ROOT}/lib"
+       dyld_library_path_prepend "${CURL_ROOT}/lib"
        path_append "${CURL_ROOT}/bin"
 fi
 
Index: ../trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindGDAL.cmake
===================================================================
--- ../trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindGDAL.cmake     (revision 27150)
+++ ../trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindGDAL.cmake     (revision 27151)
@@ -147,6 +147,8 @@
        find_library (_found_lib_${_extralib}
                NAMES ${_extralib}
                HINTS
+               ${NETCDF_ROOT}
+               $ENV{NETCDF_ROOT}
                ${HDF5_ROOT}
                $ENV{HDF5_ROOT}
                ${ZLIB_ROOT}
Index: ../trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindNETCDF.cmake
===================================================================
--- ../trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindNETCDF.cmake   (revision 27150)
+++ ../trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindNETCDF.cmake   (revision 27151)
@@ -129,7 +129,7 @@
 
 # find all manually-supplied libs
 if (NETCDF_EXTRA_LIBS)
-       # Ensure -l is precedeced by whitespace to not match
+       # Ensure -l is preceded by whitespace to not match
        # '-l' in '-L/usr/lib/x86_64-linux-gnu/hdf5/serial'
        string (REGEX MATCHALL "(^| )-l[^ ]+" _netcdf_extra_lib_dashl ${NETCDF_EXTRA_LIBS})
        string (REGEX REPLACE "(^| )-l" "" _netcdf_extra_shared_lib "${_netcdf_extra_lib_dashl}")
Index: ../trunk-jpl/externalpackages/gmt/install-6-mac-static.sh
===================================================================
--- ../trunk-jpl/externalpackages/gmt/install-6-mac-static.sh   (revision 27150)
+++ ../trunk-jpl/externalpackages/gmt/install-6-mac-static.sh   (revision 27151)
@@ -19,8 +19,8 @@
 LIBGFORTRAN_ROOT=${LIBGFORTRAN%/*}
 LIBGCC=$(mdfind -onlyin ${LIBGFORTRAN_ROOT} -name libgcc | grep -n libgcc.a | grep -v i386 | sed "s/[0-9]*://g" | head -1)
 
-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.0/static/cmake/modules/FindGDAL.cmake)
-NETCDF_EXTRA_LIBS="-lsqlite3 -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.0/static/cmake/modules/FindNETCDF.cmake)
+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)
+NETCDF_EXTRA_LIBS="-lsqlite3 -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)
 
 # Environment
 #