Changeset 28197 for issm/trunk-jpl/externalpackages/gmt/configs/6.5/static/cmake/modules/FindNETCDF.cmake.patch

Timestamp:

04/03/24 11:07:25 (12 months ago)

Author:

jdquinn

Message:

CHG: External package upgrades; fixes for distributables; cleanup

File:

• issm/trunk-jpl/externalpackages/gmt/configs/6.5/static/cmake/modules/FindNETCDF.cmake.patch (modified) (3 diffs)

issm/trunk-jpl/externalpackages/gmt/configs/6.5/static/cmake/modules/FindNETCDF.cmake.patch

@@ -1 @@
---- src/cmake/modules/FindNETCDF.cmake  2024-01-07 01:32:40
-+++ FindNETCDF.cmake     2024-03-20 19:01:13
+--- src/cmake/modules/FindNETCDF.cmake  2024-01-07 01:32:40
++++ FindNETCDF.cmake    2024-03-31 15:12:47
 @@ -67,6 +67,23 @@
                      OUTPUT_VARIABLE NETCDF_PREFIX_DIR
@@ -65 +65 @@
 +    endforeach (_extralib)
 +    # Retrieve static library names
-+    string(REGEX MATCHALL "[a-zA-Z0-9]+\\.a" _netcdf_extra_static_lib "${NETCDF_EXTRA_LIBS}")
++    string(REGEX MATCHALL "[-_/a-zA-Z0-9]+\\.a" _netcdf_extra_static_lib "${NETCDF_EXTRA_LIBS}")
 +    foreach (_extralib ${_netcdf_extra_static_lib})
-+        find_library (_found_lib_${_extralib}
++        find_library (${_extralib}
 +            NAMES ${_extralib}
 +            PATH_SUFFIXES lib
@@ -73 +73 @@
 +            ${_netcdf_extra_libpath}
 +        )
-+        list (APPEND NETCDF_LIBRARY ${_found_lib_${_extralib}})
++        list (APPEND NETCDF_LIBRARY ${_extralib})
 +    endforeach (_extralib)
 +endif (NETCDF_EXTRA_LIBS)