CI: Revert again to see if works... [ci skip]

sandialabs · Nov 9, 2022 · 6112f8c · 6112f8c
1 parent 1c1244b
commit 6112f8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmake-config b/cmake-config
@@ -248,8 +248,8 @@ fi
 MODERN=${MODERN:-NO}
 if [ "${MODERN}" == "YES" ]
 then
-#    MODERN_ARG="-D TPL_ENABLE_HDF5:BOOL=ON -D Netcdf_ALLOW_MODERN:BOOL=ON"
-    MODERN_ARG="-D Netcdf_ALLOW_MODERN:BOOL=ON"
+    MODERN_ARG="-D TPL_ENABLE_HDF5:BOOL=ON -D Netcdf_ALLOW_MODERN:BOOL=ON"
+#    MODERN_ARG="-D Netcdf_ALLOW_MODERN:BOOL=ON"
 else
     MODERN_ARG=""
 fi

diff --git a/cmake/tribits/common_tpls/FindTPLNetcdf.cmake b/cmake/tribits/common_tpls/FindTPLNetcdf.cmake
@@ -43,11 +43,11 @@ endif()
 
 set(Netcdf_ALLOW_MODERN FALSE CACHE BOOL "Allow finding Netcdf as a modern CMake config file with exported targets (and only this way)")
 
-if (Netcdf_ALLOW_MODERN AND HDF5_FOUND_MODERN_CONFIG_FILE)
-#if (Netcdf_ALLOW_MODERN)
+if ((Netcdf_ALLOW_MODERN AND HDF5_FOUND_MODERN_CONFIG_FILE) OR Netcdf_FORCE_MODERN)
 
   set(minimum_modern_netCDF_version 4.7.3)
   print_var(Netcdf_ALLOW_MODERN)
+  print_var(Netcdf_FORCE_MODERN)
   message("-- Using find_package(netCDF ${minimum_modern_netCDF_version} CONFIG) ...")
   find_package(netCDF ${minimum_modern_netCDF_version} CONFIG)
   if (netCDF_FOUND)