Remove CDASH_LOCAL variable reference (#3796)

HDFGroup · Oct 30, 2023 · 44ec53e · 44ec53e
1 parent 58ef7dc
commit 44ec53e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 27 deletions.
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
@@ -295,10 +295,10 @@ endif ()
 if (NOT HDF5_EXTERNALLY_CONFIGURED AND NOT HDF5_NO_PACKAGES)
   set (CPACK_PACKAGE_VENDOR "HDF_Group")
   set (CPACK_PACKAGE_NAME "${HDF5_PACKAGE_NAME}")
-  if (CDASH_LOCAL)
-    set (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION}")
-  else ()
+  if (NOT WIN32 OR HDF5_VERS_SUBRELEASE MATCHES "^[0-9]+$")
     set (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION_STRING}")
+  else ()
+    set (CPACK_PACKAGE_VERSION "${HDF5_PACKAGE_VERSION}")
   endif ()
   set (CPACK_PACKAGE_VERSION_MAJOR "${HDF5_PACKAGE_VERSION_MAJOR}")
   set (CPACK_PACKAGE_VERSION_MINOR "${HDF5_PACKAGE_VERSION_MINOR}")

diff --git a/CTestConfig.cmake b/CTestConfig.cmake
@@ -22,20 +22,12 @@ set (CTEST_DROP_METHOD "https")
 if (CTEST_DROP_SITE_INIT)
   set (CTEST_DROP_SITE "${CTEST_DROP_SITE_INIT}")
 else ()
-  if (CDASH_LOCAL)
-    set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
-  else ()
-    set (CTEST_DROP_SITE "cdash.hdfgroup.org")
-  endif ()
+  set (CTEST_DROP_SITE "cdash.hdfgroup.org")
 endif ()
 if (CTEST_DROP_LOCATION_INIT)
   set (CTEST_DROP_LOCATION "${CTEST_DROP_LOCATION_INIT}")
 else ()
-  if (CDASH_LOCAL)
-    set (CTEST_DROP_LOCATION "/submit.php?project=HDF5Trunk")
-  else ()
-    set (CTEST_DROP_LOCATION "/submit.php?project=HDF5")
-  endif ()
+  set (CTEST_DROP_LOCATION "/submit.php?project=HDF5")
 endif ()
 set (CTEST_DROP_SITE_CDASH TRUE)
 

diff --git a/config/cmake/LIBAEC/CMakeLists.txt b/config/cmake/LIBAEC/CMakeLists.txt
@@ -369,10 +369,10 @@ configure_file (${LIBAEC_SOURCE_DIR}/README.md ${LIBAEC_BINARY_DIR}/LIBAEC_READM
 if (NOT LIBAEC_EXTERNALLY_CONFIGURED)
   set (CPACK_PACKAGE_VENDOR "HDF_Group")
   set (CPACK_PACKAGE_NAME "${LIBAEC_PACKAGE_NAME}")
-  if (CDASH_LOCAL)
-    set (CPACK_PACKAGE_VERSION "${LIBAEC_PACKAGE_VERSION}")
-  else ()
+  if (NOT WIN32 OR LIBAEC_VERS_SUBRELEASE MATCHES "^[0-9]+$")
     set (CPACK_PACKAGE_VERSION "${LIBAEC_PACKAGE_VERSION_STRING}")
+  else ()
+    set (CPACK_PACKAGE_VERSION "${LIBAEC_PACKAGE_VERSION}")
   endif ()
   set (CPACK_PACKAGE_VERSION_MAJOR "${LIBAEC_PACKAGE_VERSION_MAJOR}")
   set (CPACK_PACKAGE_VERSION_MINOR "${LIBAEC_PACKAGE_VERSION_MINOR}")

diff --git a/config/cmake/ZLIB/CMakeLists.txt b/config/cmake/ZLIB/CMakeLists.txt
@@ -428,10 +428,10 @@ configure_file (${ZLIB_SOURCE_DIR}/README ${ZLIB_BINARY_DIR}/ZLIB_README @ONLY)
 if (NOT ZLIB_EXTERNALLY_CONFIGURED)
   set (CPACK_PACKAGE_VENDOR "HDF_Group")
   set (CPACK_PACKAGE_NAME "${ZLIB_PACKAGE_NAME}")
-  if (CDASH_LOCAL)
-    set (CPACK_PACKAGE_VERSION "${ZLIB_PACKAGE_VERSION}")
-  else ()
+  if (NOT WIN32 OR ZLIB_VERS_SUBRELEASE MATCHES "^[0-9]+$")
     set (CPACK_PACKAGE_VERSION "${ZLIB_PACKAGE_VERSION_STRING}")
+  else ()
+    set (CPACK_PACKAGE_VERSION "${ZLIB_PACKAGE_VERSION}")
   endif ()
   set (CPACK_PACKAGE_VERSION_MAJOR "${ZLIB_PACKAGE_VERSION_MAJOR}")
   set (CPACK_PACKAGE_VERSION_MINOR "${ZLIB_PACKAGE_VERSION_MINOR}")

diff --git a/config/cmake/examples/HDF5_Examples.cmake.in b/config/cmake/examples/HDF5_Examples.cmake.in
@@ -62,11 +62,6 @@ if(NOT DEFINED CTEST_SOURCE_NAME)
   set(CTEST_SOURCE_NAME "HDF5Examples")
 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()
@@ -100,9 +95,6 @@ else()
 endif()
 ### default HDF5_PLUGIN_PATH to where the filter libraries are located
 set(ENV{HDF5_PLUGIN_PATH} "${INSTALLDIR}/lib/plugin")
-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@@HDF_PACKAGE_EXT@")
 
 ###############################################################################################################