Changeset 27784

Timestamp:

06/08/23 14:32:10 (22 months ago)

Author:

jdquinn

Message:

BUG: Fixes for distributable packages (static linking of HDF5 libs to GMT; compilation of Python scripts).

Location:

issm/trunk-jpl

Files:

• externalpackages/gmt/configs/6.0/static/cmake/modules/FindGDAL.cmake (modified) (1 diff)
• externalpackages/gmt/configs/6.0/static/cmake/modules/FindNETCDF.cmake (modified) (1 diff)
• scripts/py_to_pyc.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/gmt/configs/6.0/static/cmake/modules/FindGDAL.cmake ¶

@@ -148 +148 @@
                 NAMES ${_extralib}
                 HINTS
+                ${HDF5_ROOT}
+                $ENV{HDF5_ROOT}
                 ${NETCDF_ROOT}
                 $ENV{NETCDF_ROOT}

issm/trunk-jpl/externalpackages/gmt/configs/6.0/static/cmake/modules/FindNETCDF.cmake ¶

@@ -115 +115 @@
                 NAMES ${_extralib}
                 HINTS
+                ${HDF5_ROOT}
+                $ENV{HDF5_ROOT}
                 ${ZLIB_ROOT}
                 $ENV{ZLIB_ROOT}

issm/trunk-jpl/scripts/py_to_pyc.sh ¶

@@ -14 +14 @@
 
 echo "Compiling Python source files"
-python3 -m compileall -q ${TARGET} > ${COMPILE_LOG}
+python3 -m compileall -f -q -b ${TARGET}
 
 if [ -s ${COMPILE_LOG} ]; then
-        echo "Error(s) occured while compiling Python scripts!"
+        echo "Error(s) occurred while compiling Python scripts!"
         echo "--------------- start: ${COMPILE_LOG} ---------------"
         cat ${COMPILE_LOG}