Skip to content

Commit eaeadf8

Browse files
byrnHDFbyrnHDF
authored
Update to generalized code base (#65)
1 parent 62d47ce commit eaeadf8

File tree

109 files changed

+701
-1153
lines changed

Some content is hidden

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

109 files changed

+701
-1153
lines changed

‎BLOSC/config/cmake/ConfigureChecks.cmake‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,9 @@ macro (HDF_FUNCTION_TEST OTHER_TEST)
180180
)
181181
if (${OTHER_TEST})
182182
set (${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}")
183-
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
184-
message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
185-
endif ()
183+
message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
186184
else ()
187-
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
188-
message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
189-
endif ()
185+
message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
190186
set (${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}")
191187
file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
192188
"Performing Other Test ${OTHER_TEST} failed with the following output:\n"
@@ -243,23 +239,17 @@ if (MINGW OR NOT WINDOWS)
243239
set (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
244240
set (LARGEFILE 1)
245241
set (HDF_EXTRA_FLAGS ${HDF_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
246-
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
247-
message (VERBOSE "${msg}... yes")
248-
endif ()
242+
message (VERBOSE "${msg}... yes")
249243
else ()
250244
set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
251-
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
252-
message (VERBOSE "${msg}... no")
253-
endif ()
245+
message (VERBOSE "${msg}... no")
254246
file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
255247
"Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n"
256248
)
257249
endif ()
258250
else ()
259251
set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
260-
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
261-
message (VERBOSE "${msg}... no")
262-
endif ()
252+
message (VERBOSE "${msg}... no")
263253
file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
264254
"Test TEST_LFS_WORKS Compile failed\n"
265255
)

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
1515
# Execute from a command line:
1616
# ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
1717
###############################################################################################################
18-
# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
19-
# then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
18+
# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
19+
# then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.15
2020
# ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
2121
###############################################################################################################
2222

@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
5757
##################################################################
5858

5959
if(NOT DEFINED HDF5INSTALLDIR)
60-
set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
60+
set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
6161
endif()
6262
if(NOT DEFINED INSTALLDIR)
6363
set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,20 +88,20 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
8888

8989
#TAR_SOURCE - name of tarfile
9090
#if(NOT DEFINED TAR_SOURCE)
91-
# set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
91+
# set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
9292
#endif()
9393

9494
###############################################################################################################
9595
if(WIN32)
9696
set (SITE_OS_NAME "Windows")
97-
set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}")
97+
set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/")
9898
set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build)
9999
set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_SOURCE_NAME}")
100100
set (CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}\\${CTEST_BINARY_NAME}")
101101
set (ENV{PATH} "$ENV{PATH};${HDF5INSTALLDIR}")
102102
set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
103103
else()
104-
set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}")
104+
set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/")
105105
set (ENV{LD_LIBRARY_PATH} "${HDF5INSTALLDIR}/lib")
106106
set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
107107
set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")

‎BLOSC/config/cmake/HDFMacros.cmake‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,19 +495,16 @@ endmacro ()
495495

496496
macro (ADD_H5_FLAGS h5_flag_var infile)
497497
file (STRINGS ${infile} TEST_FLAG_STREAM)
498-
#message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
499498
list (LENGTH TEST_FLAG_STREAM len_flag)
500499
if (len_flag GREATER 0)
501500
math (EXPR _FP_LEN "${len_flag} - 1")
502501
foreach (line RANGE 0 ${_FP_LEN})
503502
list (GET TEST_FLAG_STREAM ${line} str_flag)
504503
string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
505-
#message (TRACE "str_flag=${str_flag}")
506504
if (str_flag)
507505
list (APPEND ${h5_flag_var} "${str_flag}")
508506
endif ()
509507
endforeach ()
510508
endif ()
511-
#message (TRACE "h5_flag_var=${${h5_flag_var}}")
512509
endmacro ()
513510

‎BLOSC/config/cmake/HDFPluginMacros.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ macro (INSTALL_SUPPORT varname)
405405
set (CPACK_PACKAGE_VERSION_MINOR "${${PLUGIN_PACKAGE_NAME}_PACKAGE_VERSION_MINOR}")
406406
set (CPACK_PACKAGE_VERSION_PATCH "")
407407
#set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
408-
set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
409-
set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
408+
set (CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
409+
set (CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
410410
set (CPACK_PACKAGE_RELOCATABLE TRUE)
411411
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PLUGIN_NAME} Installation")
412412
set (CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}/${CPACK_PACKAGE_NAME}/${CPACK_PACKAGE_VERSION}")
@@ -458,7 +458,7 @@ macro (INSTALL_SUPPORT varname)
458458
# With CPACK_WIX_LICENSE_RTF you can override the license file used by the
459459
# WiX Generator in case CPACK_RESOURCE_FILE_LICENSE is in an unsupported
460460
# format or the .txt -> .rtf conversion does not work as expected.
461-
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.txt")
461+
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/README.txt")
462462
# .. variable:: CPACK_WIX_PRODUCT_ICON
463463
# The Icon shown next to the program name in Add/Remove programs.
464464
# set (CPACK_WIX_PRODUCT_ICON "${${PLUGIN_PACKAGE_NAME}_RESOURCES_DIR}\\\\${PLUGIN_PACKAGE_NAME}.ico")

‎BLOSC/config/cmake/README.txt.cmake.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
------------------------------------------------------------------------------
33

44
This directory contains the binary (release) distribution of
5-
@H5BLOSC_PACKAGE_NAME@-@H5BLOSC_PACKAGE_VERSION_MAJOR@ that was compiled on;
5+
@H5BLOSC_PACKAGE_NAME@-@H5BLOSC_PACKAGE_VERSION_MAJOR@.@H5BLOSC_PACKAGE_VERSION_MINOR@ that was compiled on;
66
@BINARY_PLATFORM@.
77

88
It was built with the following options:
@@ -24,9 +24,9 @@ The customary location for the plugins is under the hdf5 libraries location.
2424
be installed into any location.
2525
On linux, the installer should be executed in the location to install the
2626
plugin. The plugins will install into the location:
27-
<current dir>/HDF_Group/HDF5/1.10/lib/plugin
27+
<current dir>/HDF_Group/HDF5/1.@H5BLOSC_PACKAGE_VERSION_MINOR@/lib/plugin
2828
On Windows, the installer will default to the same location as the hdf5 installer:
29-
C:/Program Files/HDF_Group/HDF5/1.10 and into the /lib/plugin dir.
29+
C:/Program Files/HDF_Group/HDF5/1.@H5BLOSC_PACKAGE_VERSION_MINOR@ and into the /lib/plugin dir.
3030
1. Execute @H5BLOSC_PACKAGE_NAME@-@H5BLOSC_PACKAGE_VERSION@-@BINARY_SYSTEM_NAME@.@BINARY_INSTALL_ENDING@
3131
2. Follow prompts
3232
===========================================================================

‎BLOSC/config/cmake/binex/Using_CMake.txt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ I. Preconditions
2727
========================================================================
2828

2929
1. We suggest you obtain the latest CMake for windows from the Kitware
30-
web site. The HDF5PL 1.10.x product requires a minimum CMake version
31-
of 3.12.
30+
web site. The HDF5PL 1.y.x product requires a minimum CMake version
31+
of 3.12. If you are using VS2019, the minimum version is 3.15. If you are
32+
using VS2022, the minimum version is 3.21.
3233

3334
2. You have installed the HDF5 library built with CMake, by executing
3435
the HDF Install Utility (the *.msi file in the binary package for
@@ -38,26 +39,26 @@ I. Preconditions
3839
3. Set the environment variable HDF5_ROOT to the installed location of
3940
the config files for HDF5.
4041
On Windows:
41-
HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.10.x/
42+
HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.y.x/
4243
On unix:
43-
HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.10.x/
44+
HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.y.x/
4445

4546
(Note there are no quote characters used on Windows and all platforms
4647
use forward slashes)
4748

4849
4. Set the environment variable HDF5_PLUGIN_PATH to the installed location of
4950
the library files for HDFPL.
5051
On Windows:
51-
HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
52+
HDF5_PLUGIN_PATH=C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
5253
On unix:
53-
HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.10.x/lib/plugin
54+
HDF5_PLUGIN_PATH=<install root folder>/HDF_Group/HDF5/1.y.x/lib/plugin
5455

5556
5. Set the runtime path to the installed location of the library (*.so on linux
5657
and *.dll on Windows) files for HDF5.
5758
On Windows:
58-
PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.10.x/bin:C:/Program Files/HDF_Group/HDF5/1.10.x/lib/plugin
59+
PATH=%PATH%:C:/Program Files/HDF_Group/HDF5/1.y.x/bin:C:/Program Files/HDF_Group/HDF5/1.y.x/lib/plugin
5960
On linux:
60-
LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.10.x/lib;<Installation>/HDF_Group/HDF5/1.10.x/lib/plugin
61+
LD_LIBRARY_PATH=$LD_LIBRARY_PATH;<Installation>/HDF_Group/HDF5/1.y.x/lib;<Installation>/HDF_Group/HDF5/1.y.x/lib/plugin
6162

6263
6. Created separate source and build directories.
6364
(CMake commands are executed in the build directory)

‎BLOSC/config/cmake/binex/config/cmake/HDFMacros.cmake‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,19 +495,16 @@ endmacro ()
495495

496496
macro (ADD_H5_FLAGS h5_flag_var infile)
497497
file (STRINGS ${infile} TEST_FLAG_STREAM)
498-
#message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
499498
list (LENGTH TEST_FLAG_STREAM len_flag)
500499
if (len_flag GREATER 0)
501500
math (EXPR _FP_LEN "${len_flag} - 1")
502501
foreach (line RANGE 0 ${_FP_LEN})
503502
list (GET TEST_FLAG_STREAM ${line} str_flag)
504503
string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
505-
#message (TRACE "str_flag=${str_flag}")
506504
if (str_flag)
507505
list (APPEND ${h5_flag_var} "${str_flag}")
508506
endif ()
509507
endforeach ()
510508
endif ()
511-
#message (TRACE "h5_flag_var=${${h5_flag_var}}")
512509
endmacro ()
513510

‎BSHUF/config/cmake/ConfigureChecks.cmake‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,9 @@ macro (HDF_FUNCTION_TEST OTHER_TEST)
180180
)
181181
if (${OTHER_TEST})
182182
set (${OTHER_TEST} 1 CACHE INTERNAL "Other test ${FUNCTION}")
183-
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
184-
message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
185-
endif ()
183+
message (VERBOSE "Performing Other Test ${OTHER_TEST} - Success")
186184
else ()
187-
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
188-
message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
189-
endif ()
185+
message (VERBOSE "Performing Other Test ${OTHER_TEST} - Failed")
190186
set (${OTHER_TEST} "" CACHE INTERNAL "Other test ${FUNCTION}")
191187
file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
192188
"Performing Other Test ${OTHER_TEST} failed with the following output:\n"
@@ -243,23 +239,17 @@ if (MINGW OR NOT WINDOWS)
243239
set (TEST_LFS_WORKS 1 CACHE INTERNAL ${msg})
244240
set (LARGEFILE 1)
245241
set (HDF_EXTRA_FLAGS ${HDF_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
246-
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
247-
message (VERBOSE "${msg}... yes")
248-
endif ()
242+
message (VERBOSE "${msg}... yes")
249243
else ()
250244
set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
251-
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
252-
message (VERBOSE "${msg}... no")
253-
endif ()
245+
message (VERBOSE "${msg}... no")
254246
file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
255247
"Test TEST_LFS_WORKS Run failed with the following exit code:\n ${TEST_LFS_WORKS_RUN}\n"
256248
)
257249
endif ()
258250
else ()
259251
set (TEST_LFS_WORKS "" CACHE INTERNAL ${msg})
260-
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
261-
message (VERBOSE "${msg}... no")
262-
endif ()
252+
message (VERBOSE "${msg}... no")
263253
file (APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
264254
"Test TEST_LFS_WORKS Compile failed\n"
265255
)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ cmake_minimum_required(VERSION 3.12)
1515
# Execute from a command line:
1616
# ctest -S H5PL_Examples.cmake,OPTION=VALUE -C Release -VV -O test.log
1717
###############################################################################################################
18-
# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.10/lib/plugin,
19-
# then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.10
18+
# Minimum where plugins are installed within hdf5 library install, /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@/lib/plugin,
19+
# then <hdf5 root loaction> is /usr/local/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@
2020
# ctest -S H5PL_Examples.cmake,HDF5INSTALLDIR=<hdf5 root location> -C Release -VV -O test.log
2121
###############################################################################################################
2222

@@ -57,7 +57,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=$
5757
##################################################################
5858

5959
if(NOT DEFINED HDF5INSTALLDIR)
60-
set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.10")
60+
set (HDF5INSTALLDIR "${CTEST_DASHBOARD_ROOT}/HDF_Group/HDF5/1.@H5PL_PACKAGE_VERSION_MINOR@")
6161
endif()
6262
if(NOT DEFINED INSTALLDIR)
6363
set (INSTALLDIR "${HDF5INSTALLDIR}")
@@ -88,7 +88,7 @@ set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILD
8888

8989
#TAR_SOURCE - name of tarfile
9090
#if(NOT DEFINED TAR_SOURCE)
91-
# set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.10-Source")
91+
# set (CTEST_USE_TAR_SOURCE "HDFPLExamples-1.@H5PL_PACKAGE_VERSION_MINOR@-Source")
9292
#endif()
9393

9494
###############################################################################################################
@@ -101,7 +101,7 @@ if(WIN32)
101101
set (ENV{PATH} "$ENV{PATH};${HDF5INSTALLDIR}")
102102
set (HDF5_PLUGIN_ROOT "${INSTALLDIR}/lib/plugin")
103103
else()
104-
set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/share/")
104+
set (ENV{HDF5_ROOT} "${HDF5INSTALLDIR}/")
105105
set (ENV{LD_LIBRARY_PATH} "${HDF5INSTALLDIR}/lib")
106106
set (CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}/build)
107107
set (CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/${CTEST_SOURCE_NAME}")

‎BSHUF/config/cmake/HDFMacros.cmake‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -495,19 +495,16 @@ endmacro ()
495495

496496
macro (ADD_H5_FLAGS h5_flag_var infile)
497497
file (STRINGS ${infile} TEST_FLAG_STREAM)
498-
#message (TRACE "TEST_FLAG_STREAM=${TEST_FLAG_STREAM}")
499498
list (LENGTH TEST_FLAG_STREAM len_flag)
500499
if (len_flag GREATER 0)
501500
math (EXPR _FP_LEN "${len_flag} - 1")
502501
foreach (line RANGE 0 ${_FP_LEN})
503502
list (GET TEST_FLAG_STREAM ${line} str_flag)
504503
string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
505-
#message (TRACE "str_flag=${str_flag}")
506504
if (str_flag)
507505
list (APPEND ${h5_flag_var} "${str_flag}")
508506
endif ()
509507
endforeach ()
510508
endif ()
511-
#message (TRACE "h5_flag_var=${${h5_flag_var}}")
512509
endmacro ()
513510

0 commit comments

Comments
 (0)