Merge branch 'gh2712-parity.wif' of github.com:WardF/netcdf-c into gh…

…2712-parity.wif

CMakeLists.txt

@@ -1110,7 +1110,7 @@ macro(set_std_filter filter)
 # Upper case the filter name
 string(TOUPPER "${filter}" upfilter)
 string(TOLOWER "${filter}" downfilter)
-if(ENABLE_${upfilter})
+if(ENABLE_FILTER_${upfilter})
 # Define a test flag for filter
   IF(${filter}_FOUND)
     INCLUDE_DIRECTORIES(${${filter}_INCLUDE_DIRS})
@@ -1128,11 +1128,13 @@ ENDIF()
 endmacro(set_std_filter)
 
 # Locate some compressors
-OPTION(ENABLE_SZIP  "Enable use of Szip compression library if it is available." ON)
+OPTION(ENABLE_FILTER_SZIP  "Enable use of Szip compression library if it is available. Required if ENABLE_NCZARR is true." ON)
 OPTION(ENABLE_FILTER_BZ2   "Enable use of Bz2 compression library if it is available." ON)
 OPTION(ENABLE_FILTER_BLOSC "Enable use of blosc compression library if it is available." ON)
 OPTION(ENABLE_FILTER_ZSTD  "Enable use of Zstd compression library if it is available." ON)
-IF (ENABLE_SZIP)
+IF (ENABLE_FILTER_SZIP)
+  FIND_PACKAGE(Szip)
+ELSEIF(ENABLE_NCZARR)
   FIND_PACKAGE(Szip)
 ENDIF()
 IF (ENABLE_FILTER_BZ2)