Merge branch 'develop' into feature/256

Author: DJDavies2

cmake/FindSHUM.cmake

@@ -51,6 +51,7 @@ find_library(SHUM_FIELDSFILE_CLASS_LIBRARY NAMES shum_fieldsfile_class)
 find_library(SHUM_THREAD_UTILS_LIBRARY NAMES shum_thread_utils)
 find_library(SHUM_HORIZONTAL_FIELD_INTERP_LIBRARY NAMES shum_horizontal_field_interp)
 find_library(SHUM_LATLON_EQ_GRIDS_LIBRARY NAMES shum_latlon_eq_grids)
+find_library(SHUM_LIBRARY NAMES shum)
 
 set(SHUM_LIBRARIES
     ${SHUM_BYTESWAP_LIBRARY}
@@ -64,7 +65,8 @@ set(SHUM_LIBRARIES
     ${SHUM_FIELDSFILE_CLASS_LIBRARY}
     ${SHUM_THREAD_UTILS_LIBRARY}
     ${SHUM_HORIZONTAL_FIELD_INTERP_LIBRARY}
-    ${SHUM_LATLON_EQ_GRIDS_LIBRARY})
+    ${SHUM_LATLON_EQ_GRIDS_LIBRARY}
+    ${SHUM_LIBRARY})
 
 if (SHUM_ROOT AND (NOT EXISTS "${SHUM_ROOT}/include" OR NOT EXISTS "${SHUM_ROOT}/lib"))
   message(WARNING "\

deps/ops/CMakeLists.txt

@@ -139,6 +139,7 @@ target_link_libraries(ops
   ${SHUM_BYTESWAP_LIBRARY}
   ${SHUM_STRING_CONV_LIBRARY}
   ${SHUM_WGDOS_PACKING_LIBRARY}
+  ${SHUM_LIBRARY}
   NetCDF::NetCDF_Fortran
 )
 
@@ -187,6 +188,7 @@ target_link_libraries(ops_serial
   ${SHUM_BYTESWAP_LIBRARY}
   ${SHUM_STRING_CONV_LIBRARY}
   ${SHUM_WGDOS_PACKING_LIBRARY}
+  ${SHUM_LIBRARY}
   NetCDF::NetCDF_Fortran
 )