1 12 Merge SZ plugin changes from develop (#1455)

* Merge SZ plugin changes from develop

* Update examples version

* Update examples version

6 files changed, 21 insertions, 21 deletions

diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index 45b62ea..f022a4c 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -154,7 +154,7 @@ CHECK_INCLUDE_FILE_CONCAT ("arpa/inet.h"     ${HDF_PREFIX}_HAVE_ARPA_INET_H)
 # _Bool type support
 CHECK_INCLUDE_FILE_CONCAT (stdbool.h    ${HDF_PREFIX}_HAVE_STDBOOL_H)
 
-## Check for non-standard extenstion quadmath.h
+## Check for non-standard extension quadmath.h
 
 CHECK_INCLUDE_FILES(quadmath.h C_HAVE_QUADMATH)
 if (${C_HAVE_QUADMATH})
@@ -609,7 +609,7 @@ if (WINDOWS)
         message (VERBOSE "Performing Test InitOnceExecuteOnce - Success")
       endif ()
       file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-        "Performing C SOURCE FILE Test InitOnceExecuteOnce succeded with the following output:\n"
+        "Performing C SOURCE FILE Test InitOnceExecuteOnce succeeded with the following output:\n"
         "${OUTPUT}\n"
         "Return value: ${HAVE_IOEO}\n")
     else ()
diff --git a/config/cmake_ext_mod/HDFLibMacros.cmake b/config/cmake_ext_mod/HDFLibMacros.cmake
index 1ac4134..d42b213 100644
--- a/config/cmake_ext_mod/HDFLibMacros.cmake
+++ b/config/cmake_ext_mod/HDFLibMacros.cmake
@@ -126,11 +126,11 @@ macro (EXTERNAL_SZIP_LIBRARY compress_type encoding)
   endif ()
   externalproject_get_property (SZIP BINARY_DIR SOURCE_DIR)
 
-##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 "")
@@ -175,7 +175,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 ""
@@ -194,7 +194,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 ""
@@ -213,19 +213,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})
 
@@ -243,6 +239,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 ()
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index 6da2b74..d25e97a 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -427,7 +427,7 @@ macro (HDF_DIR_PATHS package_prefix)
     endif ()
   endif ()
 
-  if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  if (NOT ${package_prefix}_EXTERNALLY_CONFIGURED AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     if (CMAKE_HOST_UNIX)
       set (CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}"
         CACHE PATH "Install path prefix, prepended onto install directories." FORCE)
diff --git a/config/cmake_ext_mod/HDFUseFortran.cmake b/config/cmake_ext_mod/HDFUseFortran.cmake
index 9cbcd76..c96298f 100644
--- a/config/cmake_ext_mod/HDFUseFortran.cmake
+++ b/config/cmake_ext_mod/HDFUseFortran.cmake
@@ -22,7 +22,7 @@ if (NOT CMAKE_VERSION VERSION_LESS "3.14.0")
 endif ()
 
 #-------------------------------------------------------------------------------
-#  Fix Fortran flags if we are compiling staticly on Windows using
+#  Fix Fortran flags if we are compiling statically on Windows using
 #  Windows_MT.cmake from config/cmake/UserMacros
 #-------------------------------------------------------------------------------
 if (BUILD_STATIC_CRT_LIBS)
diff --git a/config/cmake_ext_mod/NSIS.template.in b/config/cmake_ext_mod/NSIS.template.in
index ecced05..db79466 100644
--- a/config/cmake_ext_mod/NSIS.template.in
+++ b/config/cmake_ext_mod/NSIS.template.in
@@ -849,7 +849,7 @@ Section "Uninstall"
 @CPACK_NSIS_DELETE_ICONS@
 @CPACK_NSIS_DELETE_ICONS_EXTRA@
 
-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
 
   startMenuDeleteLoop:
@@ -868,7 +868,7 @@ Section "Uninstall"
   Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
 @CPACK_NSIS_DELETE_ICONS_EXTRA@
 
-  ;Delete empty start menu parent diretories
+  ;Delete empty start menu parent directories
   StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
 
   secondStartMenuDeleteLoop:
diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake
index f552dcd..05f4473 100644
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@@ -243,7 +243,14 @@ if (NOT TEST_SKIP_COMPARE)
         list (LENGTH test_act len_act)
         file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
         list (LENGTH test_ref len_ref)
+        if (NOT len_act EQUAL len_ref)
+          set (TEST_COMPARE_RESULT 1)
+        endif ()
         if (len_act GREATER 0 AND len_ref GREATER 0)
+          if (TEST_SORT_COMPARE)
+            list (SORT test_act)
+            list (SORT test_ref)
+          endif ()
           math (EXPR _FP_LEN "${len_ref} - 1")
           foreach (line RANGE 0 ${_FP_LEN})
             list (GET test_act ${line} str_act)
@@ -263,9 +270,6 @@ if (NOT TEST_SKIP_COMPARE)
             message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
           endif ()
         endif ()
-        if (NOT len_act EQUAL len_ref)
-          set (TEST_COMPARE_RESULT 1)
-        endif ()
       endif ()
     endif ()