Skip to content

Commit 26330ff

Browse files
byrnHDFbyrnHDF
authored
Remove CDASH_LOCAL variable usage (#88)
1 parent 3ea6df1 commit 26330ff

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+139
-293
lines changed

‎BLOSC/CTestConfig.cmake‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
1919
set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
2020

2121
set (CTEST_DROP_METHOD "https")
22-
if (CDASH_LOCAL)
23-
set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
24-
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
25-
else ()
26-
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
27-
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
28-
endif ()
22+
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
23+
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
2924
set (CTEST_DROP_SITE_CDASH TRUE)
3025

3126
set (UPDATE_TYPE git)

‎BLOSC/config/cmake/H5PL_Examples.cmake.in‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
7373
set (STATICLIBRARIES "NO")
7474
endif()
7575

76-
if(NOT DEFINED HDF_LOCAL)
77-
set (CDASH_LOCAL "NO")
78-
else()
79-
set (CDASH_LOCAL "YES")
80-
endif()
8176
if(NOT DEFINED CTEST_SITE)
8277
set (CTEST_SITE "local")
8378
endif()
@@ -109,13 +104,14 @@ else()
109104
set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
110105
set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
111106
endif()
112-
if(${CDASH_LOCAL})
113-
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
114-
endif()
115107
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
116108
set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
117109

118110
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5BLOSC_ENCODER@")
111+
### use a toolchain file (supported everywhere) ####
112+
if("@CMAKE_TOOLCHAIN_FILE@")
113+
# set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
114+
endif()
119115

120116
###############################################################################################################
121117
# For any comments please contact [email protected]

‎BLOSC/config/cmake/HDFPluginMacros.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
429429
if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
430430
set (CPACK_PACKAGE_VENDOR "HDF_Group")
431431
set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
432-
if (CDASH_LOCAL)
433-
set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
434-
else ()
432+
if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
435433
set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
434+
else ()
435+
set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
436436
endif ()
437437
set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
438438
set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")

‎BLOSC/config/cmake/binex/CTestConfig.cmake‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
1919
set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
2020

2121
set (CTEST_DROP_METHOD "https")
22-
if (CDASH_LOCAL)
23-
set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
24-
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
25-
else ()
26-
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
27-
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
28-
endif ()
22+
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
23+
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
2924
set (CTEST_DROP_SITE_CDASH TRUE)
3025

3126
set (UPDATE_TYPE git)

‎BSHUF/CTestConfig.cmake‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
1919
set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
2020

2121
set (CTEST_DROP_METHOD "https")
22-
if (CDASH_LOCAL)
23-
set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
24-
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
25-
else ()
26-
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
27-
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
28-
endif ()
22+
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
23+
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
2924
set (CTEST_DROP_SITE_CDASH TRUE)
3025

3126
set (UPDATE_TYPE git)

‎BSHUF/config/cmake/H5PL_Examples.cmake.in‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
7373
set (STATICLIBRARIES "NO")
7474
endif()
7575

76-
if(NOT DEFINED HDF_LOCAL)
77-
set (CDASH_LOCAL "NO")
78-
else()
79-
set (CDASH_LOCAL "YES")
80-
endif()
8176
if(NOT DEFINED CTEST_SITE)
8277
set (CTEST_SITE "local")
8378
endif()
@@ -109,13 +104,14 @@ else()
109104
set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
110105
set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
111106
endif()
112-
if(${CDASH_LOCAL})
113-
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
114-
endif()
115107
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
116108
set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
117109

118110
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5BSHUF_ENCODER@")
111+
### use a toolchain file (supported everywhere) ####
112+
if("@CMAKE_TOOLCHAIN_FILE@")
113+
# set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
114+
endif()
119115

120116
###############################################################################################################
121117
# For any comments please contact [email protected]

‎BSHUF/config/cmake/HDFPluginMacros.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,10 @@ macro (INSTALL_SUPPORT varname)
429429
if (NOT ${PLUGIN_PACKAGE_NAME}_EXTERNALLY_CONFIGURED)
430430
set (CPACK_PACKAGE_VENDOR "HDF_Group")
431431
set (CPACK_PACKAGE_NAME "${${PLUGIN_PACKAGE_NAME}_PACKAGE_NAME}")
432-
if (CDASH_LOCAL)
433-
set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
434-
else ()
432+
if (NOT WIN32 OR ${PLUGIN_PACKAGE_NAME}_VERS_SUBRELEASE MATCHES "^[0-9]+$")
435433
set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_STRING}")
434+
else ()
435+
set (CPACK_PACKAGE_VERSION "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION}")
436436
endif ()
437437
set (CPACK_PACKAGE_VERSION_MAJOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MAJOR}")
438438
set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")

‎BSHUF/config/cmake/binex/CTestConfig.cmake‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
1919
set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
2020

2121
set (CTEST_DROP_METHOD "https")
22-
if (CDASH_LOCAL)
23-
set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
24-
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
25-
else ()
26-
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
27-
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
28-
endif ()
22+
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
23+
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
2924
set (CTEST_DROP_SITE_CDASH TRUE)
3025

3126
set (UPDATE_TYPE git)

‎BZIP2/CTestConfig.cmake‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,8 @@ set (CTEST_PROJECT_NAME "HDF5PLUGINS")
1919
set (CTEST_NIGHTLY_START_TIME "18:00:00 CST")
2020

2121
set (CTEST_DROP_METHOD "https")
22-
if (CDASH_LOCAL)
23-
set (CTEST_DROP_SITE "cdash-internal.hdfgroup.org")
24-
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
25-
else ()
26-
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
27-
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
28-
endif ()
22+
set (CTEST_DROP_SITE "cdash.hdfgroup.org")
23+
set (CTEST_DROP_LOCATION "/submit.php?project=HDF5PLUGINS")
2924
set (CTEST_DROP_SITE_CDASH TRUE)
3025

3126
set (UPDATE_TYPE git)

‎BZIP2/config/cmake/H5PL_Examples.cmake.in‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,6 @@ else(NOT DEFINED STATIC_ONLY)
7373
set (STATICLIBRARIES "NO")
7474
endif()
7575

76-
if(NOT DEFINED HDF_LOCAL)
77-
set (CDASH_LOCAL "NO")
78-
else()
79-
set (CDASH_LOCAL "YES")
80-
endif()
8176
if(NOT DEFINED CTEST_SITE)
8277
set (CTEST_SITE "local")
8378
endif()
@@ -109,13 +104,14 @@ else()
109104
set (ENV{PATH} "$ENV{PATH}:${HDF5INSTALLDIR}")
110105
set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
111106
endif()
112-
if(${CDASH_LOCAL})
113-
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCDASH_LOCAL:BOOL=ON")
114-
endif()
115107
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE_NAME@")
116108
set (ENV{HDF5_PLUGIN_PATH} "${HDF5_PLUGIN_ROOT}")
117109

118110
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DDISABLE_H5PL_ENCODER:BOOL=@DISABLE_H5BZ2_ENCODER@")
111+
### use a toolchain file (supported everywhere) ####
112+
if("@CMAKE_TOOLCHAIN_FILE@")
113+
# set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CMAKE_TOOLCHAIN_FILE@")
114+
endif()
119115

120116
###############################################################################################################
121117
# For any comments please contact [email protected]

0 commit comments

Comments
 (0)