From 26330ff4bae2c3b13b3c25ce7f3644c0d30b160a Mon Sep 17 00:00:00 2001
From: Allen Byrne <50328838+byrnHDF@users.noreply.github.com>
Date: Mon, 30 Oct 2023 14:31:05 -0500
Subject: [PATCH] Remove CDASH_LOCAL variable usage (#88)

---
 BLOSC/CTestConfig.cmake                     |  9 ++----
 BLOSC/config/cmake/H5PL_Examples.cmake.in   | 12 +++-----
 BLOSC/config/cmake/HDFPluginMacros.cmake    |  6 ++--
 BLOSC/config/cmake/binex/CTestConfig.cmake  |  9 ++----
 BSHUF/CTestConfig.cmake                     |  9 ++----
 BSHUF/config/cmake/H5PL_Examples.cmake.in   | 12 +++-----
 BSHUF/config/cmake/HDFPluginMacros.cmake    |  6 ++--
 BSHUF/config/cmake/binex/CTestConfig.cmake  |  9 ++----
 BZIP2/CTestConfig.cmake                     |  9 ++----
 BZIP2/config/cmake/H5PL_Examples.cmake.in   | 12 +++-----
 BZIP2/config/cmake/HDFPluginMacros.cmake    |  6 ++--
 BZIP2/config/cmake/binex/CTestConfig.cmake  |  9 ++----
 CMakeLists.txt                              | 32 ++++++++++-----------
 CTestConfig.cmake                           |  9 ++----
 JPEG/CTestConfig.cmake                      |  9 ++----
 JPEG/config/cmake/H5PL_Examples.cmake.in    | 12 +++-----
 JPEG/config/cmake/HDFPluginMacros.cmake     |  6 ++--
 JPEG/config/cmake/binex/CTestConfig.cmake   |  9 ++----
 LZ4/CTestConfig.cmake                       |  9 ++----
 LZ4/config/cmake/H5PL_Examples.cmake.in     | 12 +++-----
 LZ4/config/cmake/HDFPluginMacros.cmake      |  6 ++--
 LZ4/config/cmake/binex/CTestConfig.cmake    |  9 ++----
 LZF/CTestConfig.cmake                       |  9 ++----
 LZF/config/cmake/H5PL_Examples.cmake.in     | 12 +++-----
 LZF/config/cmake/HDFPluginMacros.cmake      |  6 ++--
 LZF/config/cmake/binex/CTestConfig.cmake    |  9 ++----
 MAFISC/CTestConfig.cmake                    |  9 ++----
 MAFISC/config/cmake/H5MAFISCMacros.cmake    |  2 +-
 MAFISC/config/cmake/H5PL_Examples.cmake.in  | 12 +++-----
 MAFISC/config/cmake/HDFPluginMacros.cmake   |  6 ++--
 MAFISC/config/cmake/binex/CTestConfig.cmake |  9 ++----
 SZ/CTestConfig.cmake                        |  9 ++----
 SZ/config/cmake/H5PL_Examples.cmake.in      | 12 +++-----
 SZ/config/cmake/H5SZMacros.cmake            |  2 +-
 SZ/config/cmake/HDFPluginMacros.cmake       |  6 ++--
 SZ/config/cmake/binex/CTestConfig.cmake     |  9 ++----
 ZFP/CTestConfig.cmake                       |  9 ++----
 ZFP/config/cmake/H5PL_Examples.cmake.in     | 12 +++-----
 ZFP/config/cmake/HDFPluginMacros.cmake      |  6 ++--
 ZFP/config/cmake/binex/CTestConfig.cmake    |  9 ++----
 ZSTD/CTestConfig.cmake                      |  9 ++----
 ZSTD/config/cmake/H5PL_Examples.cmake.in    | 12 +++-----
 ZSTD/config/cmake/HDFPluginMacros.cmake     |  6 ++--
 ZSTD/config/cmake/binex/CTestConfig.cmake   |  9 ++----
 config/cmake/H5PL_Examples.cmake.in         | 12 +++-----
 config/cmake/HDFPluginMacros.cmake          |  6 ++--
 config/cmake/binex/CTestConfig.cmake        |  9 ++----
 47 files changed, 139 insertions(+), 293 deletions(-)

diff --git a/BLOSC/CTestConfig.cmake b/BLOSC/CTestConfig.cmake
index 07a5f865..b1a3f2ce 100644
--- a/BLOSC/CTestConfig.cmake
+++ b/BLOSC/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/BLOSC/config/cmake/H5PL_Examples.cmake.in b/BLOSC/config/cmake/H5PL_Examples.cmake.in
index ea96d1ee..a0d65fde 100644
--- a/BLOSC/config/cmake/H5PL_Examples.cmake.in
+++ b/BLOSC/config/cmake/H5PL_Examples.cmake.in
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
   set (STATICLIBRARIES "NO")
 endif()
 
-if(NOT DEFINED HDF_LOCAL)
-  set (CDASH_LOCAL "NO")
-else()
-  set (CDASH_LOCAL "YES")
-endif()
 if(NOT DEFINED CTEST_SITE)
   set (CTEST_SITE "local")
 endif()
@@ -109,13 +104,14 @@ else()
   set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 endif()
-if(${CDASH_LOCAL})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
 set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
 
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5BLOSC_ENCODER@")
+### use a toolchain file (supported everywhere)       ####
+if("@CMAKE_TOOLCHAIN_FILE@")
+#  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
+endif()
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/BLOSC/config/cmake/HDFPluginMacros.cmake b/BLOSC/config/cmake/HDFPluginMacros.cmake
index e04468b5..4ecdf7c8 100644
--- a/BLOSC/config/cmake/HDFPluginMacros.cmake
+++ b/BLOSC/config/cmake/HDFPluginMacros.cmake
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
     if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
       set (CPACK_PACKAGE_VENDOR "HDF_Group")
       set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
-      if (CDASH_LOCAL)
-        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
-      else ()
+      if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
         set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
+      else ()
+        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
       endif ()
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
diff --git a/BLOSC/config/cmake/binex/CTestConfig.cmake b/BLOSC/config/cmake/binex/CTestConfig.cmake
index c3ac2e0b..c12a08a6 100644
--- a/BLOSC/config/cmake/binex/CTestConfig.cmake
+++ b/BLOSC/config/cmake/binex/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/BSHUF/CTestConfig.cmake b/BSHUF/CTestConfig.cmake
index 07a5f865..b1a3f2ce 100644
--- a/BSHUF/CTestConfig.cmake
+++ b/BSHUF/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/BSHUF/config/cmake/H5PL_Examples.cmake.in b/BSHUF/config/cmake/H5PL_Examples.cmake.in
index 2c86e9bf..5204f78d 100644
--- a/BSHUF/config/cmake/H5PL_Examples.cmake.in
+++ b/BSHUF/config/cmake/H5PL_Examples.cmake.in
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
   set (STATICLIBRARIES "NO")
 endif()
 
-if(NOT DEFINED HDF_LOCAL)
-  set (CDASH_LOCAL "NO")
-else()
-  set (CDASH_LOCAL "YES")
-endif()
 if(NOT DEFINED CTEST_SITE)
   set (CTEST_SITE "local")
 endif()
@@ -109,13 +104,14 @@ else()
   set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 endif()
-if(${CDASH_LOCAL})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
 set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
 
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5BSHUF_ENCODER@")
+### use a toolchain file (supported everywhere)       ####
+if("@CMAKE_TOOLCHAIN_FILE@")
+#  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
+endif()
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/BSHUF/config/cmake/HDFPluginMacros.cmake b/BSHUF/config/cmake/HDFPluginMacros.cmake
index 7e58c349..2ab16e1e 100644
--- a/BSHUF/config/cmake/HDFPluginMacros.cmake
+++ b/BSHUF/config/cmake/HDFPluginMacros.cmake
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
     if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
       set (CPACK_PACKAGE_VENDOR "HDF_Group")
       set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
-      if (CDASH_LOCAL)
-        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
-      else ()
+      if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
         set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
+      else ()
+        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
       endif ()
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
diff --git a/BSHUF/config/cmake/binex/CTestConfig.cmake b/BSHUF/config/cmake/binex/CTestConfig.cmake
index c3ac2e0b..c12a08a6 100644
--- a/BSHUF/config/cmake/binex/CTestConfig.cmake
+++ b/BSHUF/config/cmake/binex/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/BZIP2/CTestConfig.cmake b/BZIP2/CTestConfig.cmake
index 07a5f865..b1a3f2ce 100644
--- a/BZIP2/CTestConfig.cmake
+++ b/BZIP2/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/BZIP2/config/cmake/H5PL_Examples.cmake.in b/BZIP2/config/cmake/H5PL_Examples.cmake.in
index 275de870..56f3d9fc 100644
--- a/BZIP2/config/cmake/H5PL_Examples.cmake.in
+++ b/BZIP2/config/cmake/H5PL_Examples.cmake.in
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
   set (STATICLIBRARIES "NO")
 endif()
 
-if(NOT DEFINED HDF_LOCAL)
-  set (CDASH_LOCAL "NO")
-else()
-  set (CDASH_LOCAL "YES")
-endif()
 if(NOT DEFINED CTEST_SITE)
   set (CTEST_SITE "local")
 endif()
@@ -109,13 +104,14 @@ else()
   set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 endif()
-if(${CDASH_LOCAL})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
 set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
 
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5BZ2_ENCODER@")
+### use a toolchain file (supported everywhere)       ####
+if("@CMAKE_TOOLCHAIN_FILE@")
+#  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
+endif()
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/BZIP2/config/cmake/HDFPluginMacros.cmake b/BZIP2/config/cmake/HDFPluginMacros.cmake
index ef25a09e..955d6386 100644
--- a/BZIP2/config/cmake/HDFPluginMacros.cmake
+++ b/BZIP2/config/cmake/HDFPluginMacros.cmake
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
     if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
       set (CPACK_PACKAGE_VENDOR "HDF_Group")
       set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
-      if (CDASH_LOCAL)
-        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
-      else ()
+      if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
         set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
+      else ()
+        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
       endif ()
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
diff --git a/BZIP2/config/cmake/binex/CTestConfig.cmake b/BZIP2/config/cmake/binex/CTestConfig.cmake
index c3ac2e0b..c12a08a6 100644
--- a/BZIP2/config/cmake/binex/CTestConfig.cmake
+++ b/BZIP2/config/cmake/binex/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c915b0ab..808a19f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,27 +163,27 @@ endif ()
 #endif ()
 
 # SZ filter
-if (WIN32 AND MSVC_VERSION GREATER_EQUAL 1930)
+#if (WIN32 AND MSVC_VERSION GREATER_EQUAL 1930)
   #if (NOT CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" AND NOT CMAKE_C_COMPILER_ID MATCHES "Intel[Ll][Ll][Vv][Mm]")
   #  FILTER_OPTION (SZ)
   #else ()
-    set (ENABLE_SZ OFF CACHE BOOL "" FORCE)
+#    set (ENABLE_SZ OFF CACHE BOOL "" FORCE)
   #endif ()
-elseif (WIN32 AND MSVC_VERSION GREATER 1900)
-  if (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" AND NOT CMAKE_C_COMPILER_ID MATCHES "Intel[Ll][Ll][Vv][Mm]")
-    FILTER_OPTION (SZ)
-  else ()
-    set (ENABLE_SZ OFF CACHE BOOL "" FORCE)
-  endif ()
-elseif (NOT WIN32)
-  if(CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" AND NOT CMAKE_C_COMPILER_ID MATCHES "Apple[Cc]lang")
-    FILTER_OPTION (SZ)
-  else ()
-    set (ENABLE_SZ OFF CACHE BOOL "" FORCE)
-  endif ()
-else ()
+#elseif (WIN32 AND MSVC_VERSION GREATER 1900)
+#  if (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" AND NOT CMAKE_C_COMPILER_ID MATCHES "Intel[Ll][Ll][Vv][Mm]")
+#    FILTER_OPTION (SZ)
+#  else ()
+#    set (ENABLE_SZ OFF CACHE BOOL "" FORCE)
+#  endif ()
+#elseif (NOT WIN32)
+#  if(CMAKE_C_COMPILER_ID MATCHES "[Cc]lang" AND NOT CMAKE_C_COMPILER_ID MATCHES "Apple[Cc]lang")
+#    FILTER_OPTION (SZ)
+#  else ()
+#    set (ENABLE_SZ OFF CACHE BOOL "" FORCE)
+#  endif ()
+#else ()
   set (ENABLE_SZ OFF CACHE BOOL "" FORCE)
-endif ()
+#endif ()
 
 # ZFP filter
 FILTER_OPTION (ZFP)
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 07a5f865..b1a3f2ce 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/JPEG/CTestConfig.cmake b/JPEG/CTestConfig.cmake
index 07a5f865..b1a3f2ce 100644
--- a/JPEG/CTestConfig.cmake
+++ b/JPEG/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/JPEG/config/cmake/H5PL_Examples.cmake.in b/JPEG/config/cmake/H5PL_Examples.cmake.in
index b7a7108f..0cf8f94d 100644
--- a/JPEG/config/cmake/H5PL_Examples.cmake.in
+++ b/JPEG/config/cmake/H5PL_Examples.cmake.in
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
   set (STATICLIBRARIES "NO")
 endif()
 
-if(NOT DEFINED HDF_LOCAL)
-  set (CDASH_LOCAL "NO")
-else()
-  set (CDASH_LOCAL "YES")
-endif()
 if(NOT DEFINED CTEST_SITE)
   set (CTEST_SITE "local")
 endif()
@@ -109,13 +104,14 @@ else()
   set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 endif()
-if(${CDASH_LOCAL})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
 set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
 
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5JPEG_ENCODER@")
+### use a toolchain file (supported everywhere)       ####
+if("@CMAKE_TOOLCHAIN_FILE@")
+#  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
+endif()
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/JPEG/config/cmake/HDFPluginMacros.cmake b/JPEG/config/cmake/HDFPluginMacros.cmake
index 611e213c..407a7e8a 100644
--- a/JPEG/config/cmake/HDFPluginMacros.cmake
+++ b/JPEG/config/cmake/HDFPluginMacros.cmake
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
     if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
       set (CPACK_PACKAGE_VENDOR "HDF_Group")
       set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
-      if (CDASH_LOCAL)
-        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
-      else ()
+      if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
         set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
+      else ()
+        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
       endif ()
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
diff --git a/JPEG/config/cmake/binex/CTestConfig.cmake b/JPEG/config/cmake/binex/CTestConfig.cmake
index c3ac2e0b..c12a08a6 100644
--- a/JPEG/config/cmake/binex/CTestConfig.cmake
+++ b/JPEG/config/cmake/binex/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/LZ4/CTestConfig.cmake b/LZ4/CTestConfig.cmake
index 07a5f865..b1a3f2ce 100644
--- a/LZ4/CTestConfig.cmake
+++ b/LZ4/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/LZ4/config/cmake/H5PL_Examples.cmake.in b/LZ4/config/cmake/H5PL_Examples.cmake.in
index 2fc2ed37..055a690f 100644
--- a/LZ4/config/cmake/H5PL_Examples.cmake.in
+++ b/LZ4/config/cmake/H5PL_Examples.cmake.in
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
   set (STATICLIBRARIES "NO")
 endif()
 
-if(NOT DEFINED HDF_LOCAL)
-  set (CDASH_LOCAL "NO")
-else()
-  set (CDASH_LOCAL "YES")
-endif()
 if(NOT DEFINED CTEST_SITE)
   set (CTEST_SITE "local")
 endif()
@@ -109,13 +104,14 @@ else()
   set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 endif()
-if(${CDASH_LOCAL})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
 set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
 
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5LZ4_ENCODER@")
+### use a toolchain file (supported everywhere)       ####
+if("@CMAKE_TOOLCHAIN_FILE@")
+#  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
+endif()
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/LZ4/config/cmake/HDFPluginMacros.cmake b/LZ4/config/cmake/HDFPluginMacros.cmake
index 4d776cca..31b79af5 100644
--- a/LZ4/config/cmake/HDFPluginMacros.cmake
+++ b/LZ4/config/cmake/HDFPluginMacros.cmake
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
     if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
       set (CPACK_PACKAGE_VENDOR "HDF_Group")
       set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
-      if (CDASH_LOCAL)
-        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
-      else ()
+      if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
         set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
+      else ()
+        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
       endif ()
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
diff --git a/LZ4/config/cmake/binex/CTestConfig.cmake b/LZ4/config/cmake/binex/CTestConfig.cmake
index c3ac2e0b..c12a08a6 100644
--- a/LZ4/config/cmake/binex/CTestConfig.cmake
+++ b/LZ4/config/cmake/binex/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/LZF/CTestConfig.cmake b/LZF/CTestConfig.cmake
index 07a5f865..b1a3f2ce 100644
--- a/LZF/CTestConfig.cmake
+++ b/LZF/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/LZF/config/cmake/H5PL_Examples.cmake.in b/LZF/config/cmake/H5PL_Examples.cmake.in
index 4b68bc9f..ca76d424 100644
--- a/LZF/config/cmake/H5PL_Examples.cmake.in
+++ b/LZF/config/cmake/H5PL_Examples.cmake.in
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
   set (STATICLIBRARIES "NO")
 endif()
 
-if(NOT DEFINED HDF_LOCAL)
-  set (CDASH_LOCAL "NO")
-else()
-  set (CDASH_LOCAL "YES")
-endif()
 if(NOT DEFINED CTEST_SITE)
   set (CTEST_SITE "local")
 endif()
@@ -109,13 +104,14 @@ else()
   set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 endif()
-if(${CDASH_LOCAL})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
 set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
 
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5LZF_ENCODER@")
+### use a toolchain file (supported everywhere)       ####
+if("@CMAKE_TOOLCHAIN_FILE@")
+#  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
+endif()
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/LZF/config/cmake/HDFPluginMacros.cmake b/LZF/config/cmake/HDFPluginMacros.cmake
index 72be07b6..d12b1bbe 100644
--- a/LZF/config/cmake/HDFPluginMacros.cmake
+++ b/LZF/config/cmake/HDFPluginMacros.cmake
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
     if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
       set (CPACK_PACKAGE_VENDOR "HDF_Group")
       set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
-      if (CDASH_LOCAL)
-        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
-      else ()
+      if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
         set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
+      else ()
+        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
       endif ()
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
diff --git a/LZF/config/cmake/binex/CTestConfig.cmake b/LZF/config/cmake/binex/CTestConfig.cmake
index c3ac2e0b..c12a08a6 100644
--- a/LZF/config/cmake/binex/CTestConfig.cmake
+++ b/LZF/config/cmake/binex/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/MAFISC/CTestConfig.cmake b/MAFISC/CTestConfig.cmake
index 07a5f865..b1a3f2ce 100644
--- a/MAFISC/CTestConfig.cmake
+++ b/MAFISC/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/MAFISC/config/cmake/H5MAFISCMacros.cmake b/MAFISC/config/cmake/H5MAFISCMacros.cmake
index 55dc4815..12a99b99 100644
--- a/MAFISC/config/cmake/H5MAFISCMacros.cmake
+++ b/MAFISC/config/cmake/H5MAFISCMacros.cmake
@@ -12,7 +12,7 @@
 
 include (FetchContent)
 #-------------------------------------------------------------------------------
-macro (EXTERNAL_MAFISC_LIBRARY compress_type libtype)
+macro (EXTERNAL_MAFISC_LIBRARY compress_type)
   if (${compress_type} MATCHES "GIT")
     FetchContent_Declare (MAFISC
         GIT_REPOSITORY ${MAFISC_URL}
diff --git a/MAFISC/config/cmake/H5PL_Examples.cmake.in b/MAFISC/config/cmake/H5PL_Examples.cmake.in
index 1273dc3c..48d15a23 100644
--- a/MAFISC/config/cmake/H5PL_Examples.cmake.in
+++ b/MAFISC/config/cmake/H5PL_Examples.cmake.in
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
   set (STATICLIBRARIES "NO")
 endif()
 
-if(NOT DEFINED HDF_LOCAL)
-  set (CDASH_LOCAL "NO")
-else()
-  set (CDASH_LOCAL "YES")
-endif()
 if(NOT DEFINED CTEST_SITE)
   set (CTEST_SITE "local")
 endif()
@@ -109,13 +104,14 @@ else()
   set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 endif()
-if(${CDASH_LOCAL})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
 set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
 
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5MAFISC_ENCODER@")
+### use a toolchain file (supported everywhere)       ####
+if("@CMAKE_TOOLCHAIN_FILE@")
+#  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
+endif()
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/MAFISC/config/cmake/HDFPluginMacros.cmake b/MAFISC/config/cmake/HDFPluginMacros.cmake
index 426c152b..0e0766f4 100644
--- a/MAFISC/config/cmake/HDFPluginMacros.cmake
+++ b/MAFISC/config/cmake/HDFPluginMacros.cmake
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
     if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
       set (CPACK_PACKAGE_VENDOR "HDF_Group")
       set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
-      if (CDASH_LOCAL)
-        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
-      else ()
+      if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
         set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
+      else ()
+        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
       endif ()
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
diff --git a/MAFISC/config/cmake/binex/CTestConfig.cmake b/MAFISC/config/cmake/binex/CTestConfig.cmake
index c3ac2e0b..c12a08a6 100644
--- a/MAFISC/config/cmake/binex/CTestConfig.cmake
+++ b/MAFISC/config/cmake/binex/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/SZ/CTestConfig.cmake b/SZ/CTestConfig.cmake
index 07a5f865..b1a3f2ce 100644
--- a/SZ/CTestConfig.cmake
+++ b/SZ/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/SZ/config/cmake/H5PL_Examples.cmake.in b/SZ/config/cmake/H5PL_Examples.cmake.in
index c448d52b..c1f1fa55 100644
--- a/SZ/config/cmake/H5PL_Examples.cmake.in
+++ b/SZ/config/cmake/H5PL_Examples.cmake.in
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
   set (STATICLIBRARIES "NO")
 endif()
 
-if(NOT DEFINED HDF_LOCAL)
-  set (CDASH_LOCAL "NO")
-else()
-  set (CDASH_LOCAL "YES")
-endif()
 if(NOT DEFINED CTEST_SITE)
   set (CTEST_SITE "local")
 endif()
@@ -109,13 +104,14 @@ else()
   set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 endif()
-if(${CDASH_LOCAL})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
 set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
 
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5SZ_ENCODER@")
+### use a toolchain file (supported everywhere)       ####
+if("@CMAKE_TOOLCHAIN_FILE@")
+#  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
+endif()
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/SZ/config/cmake/H5SZMacros.cmake b/SZ/config/cmake/H5SZMacros.cmake
index aa133a0d..3de93818 100644
--- a/SZ/config/cmake/H5SZMacros.cmake
+++ b/SZ/config/cmake/H5SZMacros.cmake
@@ -12,7 +12,7 @@
 
 include (FetchContent)
 #-------------------------------------------------------------------------------
-macro (EXTERNAL_SZ_LIBRARY compress_type libtype)
+macro (EXTERNAL_SZ_LIBRARY compress_type)
   if (${compress_type} MATCHES "GIT")
     FetchContent_Declare (SZF
         GIT_REPOSITORY ${SZ_URL}
diff --git a/SZ/config/cmake/HDFPluginMacros.cmake b/SZ/config/cmake/HDFPluginMacros.cmake
index a886e1f1..3f071ab1 100644
--- a/SZ/config/cmake/HDFPluginMacros.cmake
+++ b/SZ/config/cmake/HDFPluginMacros.cmake
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
     if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
       set (CPACK_PACKAGE_VENDOR "HDF_Group")
       set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
-      if (CDASH_LOCAL)
-        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
-      else ()
+      if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
         set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
+      else ()
+        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
       endif ()
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
diff --git a/SZ/config/cmake/binex/CTestConfig.cmake b/SZ/config/cmake/binex/CTestConfig.cmake
index c3ac2e0b..c12a08a6 100644
--- a/SZ/config/cmake/binex/CTestConfig.cmake
+++ b/SZ/config/cmake/binex/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/ZFP/CTestConfig.cmake b/ZFP/CTestConfig.cmake
index 07a5f865..b1a3f2ce 100644
--- a/ZFP/CTestConfig.cmake
+++ b/ZFP/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/ZFP/config/cmake/H5PL_Examples.cmake.in b/ZFP/config/cmake/H5PL_Examples.cmake.in
index 4df098c5..2bc8b93d 100644
--- a/ZFP/config/cmake/H5PL_Examples.cmake.in
+++ b/ZFP/config/cmake/H5PL_Examples.cmake.in
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
   set (STATICLIBRARIES "NO")
 endif()
 
-if(NOT DEFINED HDF_LOCAL)
-  set (CDASH_LOCAL "NO")
-else()
-  set (CDASH_LOCAL "YES")
-endif()
 if(NOT DEFINED CTEST_SITE)
   set (CTEST_SITE "local")
 endif()
@@ -109,13 +104,14 @@ else()
   set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 endif()
-if(${CDASH_LOCAL})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
 set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
 
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5ZFP_ENCODER@")
+### use a toolchain file (supported everywhere)       ####
+if("@CMAKE_TOOLCHAIN_FILE@")
+#  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
+endif()
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/ZFP/config/cmake/HDFPluginMacros.cmake b/ZFP/config/cmake/HDFPluginMacros.cmake
index 6b3b688c..9d61575c 100644
--- a/ZFP/config/cmake/HDFPluginMacros.cmake
+++ b/ZFP/config/cmake/HDFPluginMacros.cmake
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
     if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
       set (CPACK_PACKAGE_VENDOR "HDF_Group")
       set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
-      if (CDASH_LOCAL)
-        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
-      else ()
+      if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
         set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
+      else ()
+        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
       endif ()
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
diff --git a/ZFP/config/cmake/binex/CTestConfig.cmake b/ZFP/config/cmake/binex/CTestConfig.cmake
index c3ac2e0b..c12a08a6 100644
--- a/ZFP/config/cmake/binex/CTestConfig.cmake
+++ b/ZFP/config/cmake/binex/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/ZSTD/CTestConfig.cmake b/ZSTD/CTestConfig.cmake
index 07a5f865..b1a3f2ce 100644
--- a/ZSTD/CTestConfig.cmake
+++ b/ZSTD/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/ZSTD/config/cmake/H5PL_Examples.cmake.in b/ZSTD/config/cmake/H5PL_Examples.cmake.in
index 3512f4a5..51f9192a 100644
--- a/ZSTD/config/cmake/H5PL_Examples.cmake.in
+++ b/ZSTD/config/cmake/H5PL_Examples.cmake.in
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
   set (STATICLIBRARIES "NO")
 endif()
 
-if(NOT DEFINED HDF_LOCAL)
-  set (CDASH_LOCAL "NO")
-else()
-  set (CDASH_LOCAL "YES")
-endif()
 if(NOT DEFINED CTEST_SITE)
   set (CTEST_SITE "local")
 endif()
@@ -109,13 +104,14 @@ else()
   set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 endif()
-if(${CDASH_LOCAL})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
 set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
 
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5ZSTD_ENCODER@")
+### use a toolchain file (supported everywhere)       ####
+if("@CMAKE_TOOLCHAIN_FILE@")
+#  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
+endif()
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/ZSTD/config/cmake/HDFPluginMacros.cmake b/ZSTD/config/cmake/HDFPluginMacros.cmake
index 19252b92..5ff294d6 100644
--- a/ZSTD/config/cmake/HDFPluginMacros.cmake
+++ b/ZSTD/config/cmake/HDFPluginMacros.cmake
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
     if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
       set (CPACK_PACKAGE_VENDOR "HDF_Group")
       set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
-      if (CDASH_LOCAL)
-        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
-      else ()
+      if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
         set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
+      else ()
+        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
       endif ()
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
diff --git a/ZSTD/config/cmake/binex/CTestConfig.cmake b/ZSTD/config/cmake/binex/CTestConfig.cmake
index c3ac2e0b..c12a08a6 100644
--- a/ZSTD/config/cmake/binex/CTestConfig.cmake
+++ b/ZSTD/config/cmake/binex/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)
diff --git a/config/cmake/H5PL_Examples.cmake.in b/config/cmake/H5PL_Examples.cmake.in
index 714b39f2..3089ec0f 100644
--- a/config/cmake/H5PL_Examples.cmake.in
+++ b/config/cmake/H5PL_Examples.cmake.in
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
   set (STATICLIBRARIES "NO")
 endif()
 
-if(NOT DEFINED HDF_LOCAL)
-  set (CDASH_LOCAL "NO")
-else()
-  set (CDASH_LOCAL "YES")
-endif()
 if(NOT DEFINED CTEST_SITE)
   set (CTEST_SITE "local")
 endif()
@@ -109,13 +104,14 @@ else()
   set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
   set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
 endif()
-if(${CDASH_LOCAL})
-  set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
-endif()
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
 set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
 
 set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5PL_ENCODER@")
+### use a toolchain file (supported everywhere)       ####
+if("@CMAKE_TOOLCHAIN_FILE@")
+#  set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
+endif()
 
 ###############################################################################################################
 # For any comments please contact cdashhelp@hdfgroup.org
diff --git a/config/cmake/HDFPluginMacros.cmake b/config/cmake/HDFPluginMacros.cmake
index f051f62f..dec3bd91 100644
--- a/config/cmake/HDFPluginMacros.cmake
+++ b/config/cmake/HDFPluginMacros.cmake
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
     if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
       set (CPACK_PACKAGE_VENDOR "HDF_Group")
       set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
-      if (CDASH_LOCAL)
-        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
-      else ()
+      if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
         set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
+      else ()
+        set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
       endif ()
       set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
       set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
diff --git a/config/cmake/binex/CTestConfig.cmake b/config/cmake/binex/CTestConfig.cmake
index c3ac2e0b..c12a08a6 100644
--- a/config/cmake/binex/CTestConfig.cmake
+++ b/config/cmake/binex/CTestConfig.cmake
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
 set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
 
 set (CTEST_DROP_METHOD "https")
-if (CDASH_LOCAL)
-  set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-else ()
-  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
-endif ()
+set (CTEST_DROP_SITE "cdash.hdfgroup.org")
+set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
 set (CTEST_DROP_SITE_CDASH TRUE)
 
 set (UPDATE_TYPE git)