Switch custom Bzip2 cmake module to standard

Author: Klaus Zimmermann

CMakeLists.txt

@@ -1125,7 +1125,7 @@ endmacro(set_std_filter)
 
 # Locate some compressors
 FIND_PACKAGE(Szip)
-FIND_PACKAGE(Bz2)
+FIND_PACKAGE(BZip2)
 FIND_PACKAGE(Blosc)
 FIND_PACKAGE(Zstd)
 
@@ -1135,14 +1135,14 @@ set_std_filter(Szip)
   SET(HAVE_SZ ${Szip_FOUND})
 set_std_filter(Blosc)
 set_std_filter(Zstd)
-IF(Bz2_FOUND)
-  set_std_filter(Bz2)
+IF(BZIP2_FOUND)
+  set_std_filter(BZIP2)
 ELSE()
   # The reason we use a local version is to support a more comples test case
   MESSAGE("libbz2 not found using built-in version")
-  SET(HAVE_LOCAL_BZ2 ON)
-  SET(HAVE_BZ2 ON)
-  set(STD_FILTERS "${STD_FILTERS} bz2")
+  SET(HAVE_LOCAL_BZIP2 ON)
+  SET(HAVE_BZIP2 ON)
+  set(STD_FILTERS "${STD_FILTERS} bzip2")
 ENDIF()
 
 # If user wants, then install selected plugins (default on)
@@ -2562,7 +2562,8 @@ is_enabled(HAVE_SZ HAS_SZIP)
 is_enabled(HAVE_SZ HAS_SZLIB_WRITE)
 is_enabled(HAVE_ZSTD HAS_ZSTD)
 is_enabled(HAVE_BLOSC HAS_BLOSC)
-is_enabled(HAVE_BZ2 HAS_BZ2)
+is_enabled(HAVE_BZIP2 HAS_BZIP2)
+is_enabled(HAVE_BZIP2 HAS_BZ2)
 is_enabled(ENABLE_REMOTE_FUNCTIONALITY DO_REMOTE_FUNCTIONALITY)
 
 if(ENABLE_S3_INTERNAL)

cmake/modules/FindBz2.cmake

@@ -91,8 +91,8 @@ ENDIF()
 IF(Zstd_FOUND)
 SET(TLL_LIBS ${TLL_LIBS} ${Zstd_LIBRARIES})
 ENDIF()
-IF(Bz2_FOUND)
-SET(TLL_LIBS ${TLL_LIBS} ${Bz2_LIBRARIES})
+IF(BZIP2_FOUND)
+SET(TLL_LIBS ${TLL_LIBS} ${BZIP2_LIBRARIES})
 ENDIF()
 IF(SZIP_FOUND)
 SET(TLL_LIBS ${TLL_LIBS} ${SZIP_LIBRARIES})

cmake/modules/FindBzip2.cmake

@@ -94,12 +94,12 @@ IF(HAVE_SZ)
   buildplugin(h5szip "h5szip" ${Szip_LIBRARIES})
 ENDIF()
 
-IF(HAVE_LOCAL_BZ2)
+IF(HAVE_LOCAL_BZIP2)
 SET(h5bzip2_SOURCES H5Zbzip2.c blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c bzlib.h bzlib_private.h)
 buildplugin(h5bzip2 "h5bzip2")
 ELSE()
 SET(h5bzip2_SOURCES H5Zbzip2.c)
-buildplugin(h5bzip2 "h5bzip2" ${Bzip2_LIBRARIES})
+buildplugin(h5bzip2 "h5bzip2" ${BZIP2_LIBRARIES})
 ENDIF()