Add SZ filter and adjust compression file names to avoid conflicts (#1434)

* Updated plugins project required adjustments

* Updated plugins need to distinguish external libs

* Fix missed rename

* Use same name for windows as linux - avoid name clash

2 files changed, 63 insertions, 67 deletions

diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index b322948..6242b12 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -224,61 +224,61 @@ set (HDF_EXTRA_C_FLAGS)
 set (HDF_EXTRA_FLAGS)
 if (MINGW OR NOT WINDOWS)
   if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-	# Linux Specific flags
-	# This was originally defined as _POSIX_SOURCE which was updated to
-	# _POSIX_C_SOURCE=199506L to expose a greater amount of POSIX
-	# functionality so clock_gettime and CLOCK_MONOTONIC are defined
-	# correctly. This was later updated to 200112L so that
-	# posix_memalign() is visible for the direct VFD code on Linux
-	# systems.
-	# POSIX feature information can be found in the gcc manual at:
-	# http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
-	set (HDF_EXTRA_C_FLAGS -D_POSIX_C_SOURCE=200809L)
-
-	# Need to add this so that O_DIRECT is visible for the direct
-	# VFD on Linux systems.
-	set (HDF_EXTRA_C_FLAGS ${HDF_EXTRA_C_FLAGS} -D_GNU_SOURCE)
-
-	option (HDF_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
-	if (HDF_ENABLE_LARGE_FILE AND NOT DEFINED TEST_LFS_WORKS_RUN)
-	  set (msg "Performing TEST_LFS_WORKS")
-	  try_run (TEST_LFS_WORKS_RUN   TEST_LFS_WORKS_COMPILE
-		  ${CMAKE_BINARY_DIR}
-		  ${HDF_RESOURCES_EXT_DIR}/HDFTests.c
-		  COMPILE_DEFINITIONS "-DTEST_LFS_WORKS"
-	  )
-
-	  # The LARGEFILE definitions were from the transition period
-	  # and are probably no longer needed. The FILE_OFFSET_BITS
-	  # check should be generalized for all POSIX systems as it
-	  # is in the Autotools.
-	  if (TEST_LFS_WORKS_COMPILE)
-		if (TEST_LFS_WORKS_RUN MATCHES 0)
-		  set (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
-		  set (LARGEFILE 1)
-		  set (HDF_EXTRA_FLAGS ${HDF_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
-		  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-			message (VERBOSE "${msg}... yes")
-		  endif ()
-		else ()
-		  set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-		  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-			message (VERBOSE "${msg}... no")
-		  endif ()
-		  file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-				"Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n"
-		  )
-		endif ()
-	  else ()
-		set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
-		if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
-			message (VERBOSE "${msg}... no")
-		endif ()
-		file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-			"Test TEST_LFS_WORKS Compile failed\n"
-		)
-	  endif ()
-	endif ()
+    # Linux Specific flags
+    # This was originally defined as _POSIX_SOURCE which was updated to
+    # _POSIX_C_SOURCE=199506L to expose a greater amount of POSIX
+    # functionality so clock_gettime and CLOCK_MONOTONIC are defined
+    # correctly. This was later updated to 200112L so that
+    # posix_memalign() is visible for the direct VFD code on Linux
+    # systems.
+    # POSIX feature information can be found in the gcc manual at:
+    # http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
+    set (HDF_EXTRA_C_FLAGS -D_POSIX_C_SOURCE=200809L)
+
+    # Need to add this so that O_DIRECT is visible for the direct
+    # VFD on Linux systems.
+    set (HDF_EXTRA_C_FLAGS ${HDF_EXTRA_C_FLAGS} -D_GNU_SOURCE)
+
+    option (HDF_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
+    if (HDF_ENABLE_LARGE_FILE AND NOT DEFINED TEST_LFS_WORKS_RUN)
+      set (msg "Performing TEST_LFS_WORKS")
+      try_run (TEST_LFS_WORKS_RUN   TEST_LFS_WORKS_COMPILE
+          ${CMAKE_BINARY_DIR}
+          ${HDF_RESOURCES_EXT_DIR}/HDFTests.c
+          COMPILE_DEFINITIONS "-DTEST_LFS_WORKS"
+      )
+
+      # The LARGEFILE definitions were from the transition period
+      # and are probably no longer needed. The FILE_OFFSET_BITS
+      # check should be generalized for all POSIX systems as it
+      # is in the Autotools.
+      if (TEST_LFS_WORKS_COMPILE)
+        if (TEST_LFS_WORKS_RUN MATCHES 0)
+          set (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
+          set (LARGEFILE 1)
+          set (HDF_EXTRA_FLAGS ${HDF_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
+          if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+            message (VERBOSE "${msg}... yes")
+          endif ()
+        else ()
+          set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
+          if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+            message (VERBOSE "${msg}... no")
+          endif ()
+          file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+                "Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n"
+          )
+        endif ()
+      else ()
+        set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
+        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+            message (VERBOSE "${msg}... no")
+        endif ()
+        file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+            "Test TEST_LFS_WORKS Compile failed\n"
+        )
+      endif ()
+    endif ()
     set (CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${HDF_EXTRA_FLAGS})
   endif ()
 endif ()
diff --git a/config/cmake_ext_mod/HDFLibMacros.cmake b/config/cmake_ext_mod/HDFLibMacros.cmake
index 2af3229..40d06e7 100644
--- a/config/cmake_ext_mod/HDFLibMacros.cmake
+++ b/config/cmake_ext_mod/HDFLibMacros.cmake
@@ -139,11 +139,11 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
 #    add_subdirectory(${szip_SOURCE_DIR} ${szip_BINARY_DIR})
 #  endif()
 #
-##include (${BINARY_DIR}/${SZ_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
+##include (${BINARY_DIR}/${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
 # Create imported target szip-static
   if (USE_LIBAEC)
     add_library(${HDF_PACKAGE_NAMESPACE}sz-static STATIC IMPORTED)
-    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}sz-static "sz" STATIC "")
+    HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}sz-static "szaec" STATIC "")
     add_dependencies (${HDF_PACKAGE_NAMESPACE}sz-static SZIP)
     add_library(${HDF_PACKAGE_NAMESPACE}aec-static STATIC IMPORTED)
     HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}aec-static "aec" STATIC "")
@@ -188,7 +188,7 @@ endmacro ()
 #-------------------------------------------------------------------------------
 macro (EXTERNAL_ZLIB_LIBRARY compress_type)
   if (${compress_type} MATCHES "GIT")
-    EXTERNALPROJECT_ADD (ZLIB
+    EXTERNALPROJECT_ADD (HDF5_ZLIB
         GIT_REPOSITORY ${ZLIB_URL}
         GIT_TAG ${ZLIB_BRANCH}
         INSTALL_COMMAND ""
@@ -207,7 +207,7 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
             -DPACKAGE_NAMESPACE=${HDF_PACKAGE_NAMESPACE}
     )
   elseif (${compress_type} MATCHES "TGZ")
-    EXTERNALPROJECT_ADD (ZLIB
+    EXTERNALPROJECT_ADD (HDF5_ZLIB
         URL ${ZLIB_URL}
         URL_MD5 ""
         INSTALL_COMMAND ""
@@ -226,19 +226,15 @@ macro (EXTERNAL_ZLIB_LIBRARY compress_type)
             -DPACKAGE_NAMESPACE=${HDF_PACKAGE_NAMESPACE}
     )
   endif ()
-  externalproject_get_property (ZLIB BINARY_DIR SOURCE_DIR)
+  externalproject_get_property (HDF5_ZLIB BINARY_DIR SOURCE_DIR)
 
-  if (WIN32)
-    set (ZLIB_LIB_NAME "zlib")
-  else ()
-    set (ZLIB_LIB_NAME "z")
-  endif ()
+  set (ZLIB_LIB_NAME "z")
 ##include (${BINARY_DIR}/${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT}-targets.cmake)
 # Create imported target zlib-static
   add_library(${HDF_PACKAGE_NAMESPACE}zlib-static STATIC IMPORTED)
 #  add_library(${HDF_PACKAGE_NAMESPACE}zlib-static ALIAS zlib-static)
   HDF_IMPORT_SET_LIB_OPTIONS (${HDF_PACKAGE_NAMESPACE}zlib-static ${ZLIB_LIB_NAME} STATIC "")
-  add_dependencies (${HDF_PACKAGE_NAMESPACE}zlib-static ZLIB)
+  add_dependencies (${HDF_PACKAGE_NAMESPACE}zlib-static HDF5_ZLIB)
   set (ZLIB_STATIC_LIBRARY "${HDF_PACKAGE_NAMESPACE}zlib-static")
   set (ZLIB_LIBRARIES ${ZLIB_STATIC_LIBRARY})
 
@@ -256,6 +252,6 @@ macro (PACKAGE_ZLIB_LIBRARY compress_type)
   )
   set (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/zconf.h)
   if (${compress_type} MATCHES "GIT" OR ${compress_type} MATCHES "TGZ")
-    add_dependencies (ZLIB-GenHeader-Copy ZLIB)
+    add_dependencies (ZLIB-GenHeader-Copy HDF5_ZLIB)
   endif ()
 endmacro ()