Merge pull request #880 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop* commit '77ed9e9645dcfc0d277472f2ac7b011f44b423ff':
Increase maximum number of retries to 30 for h5watch tests.
Merge pull request #877 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop* commit 'f837afc8758c7c0394e2f40d636a8e6319b6b668':
Update reference files for CMake options
Fix windows compile errors abstract out common settings
Fix case of command
Merge pull request #868 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop* commit 'fbcaec3555b6fce1a6be92b019972f51b6a51439':
HDFFV-10396 typo fix
HDFFV-10396 Add note
HDFFV-10396 Eliminate overuse of h5tools_simple_prefix function
Merge pull request #864 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop* commit 'f22d8726707e26b97df38962b404754119e8abd7':
HDFFV-10385 some platforms need this var
HDFFV-10385 test OUTPUT_NAME var for mac
HDFFV-10385 Correct name of var
Merge pull request #863 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop* commit '608a71200d4f70708c141790ec33f88e2e1a9993':
HDFFV-10385 rename vars and macros
HDFFV-10385 Refactor out CMAKE_BUILD_TYPE usage
Merge pull request #862 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop* commit '3374818d14c11e9177370fe940c966240de34052':
HDFFV-10393 fix incorrect search for name in h5repack object table
Merge pull request #861 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop* commit '601ae0ebbc2b766ebf2662315b3143b0f903d76b':
HDFFV-10392 change size of local array to 16 chars
HDFFV-10385 rework java names
HDFFV-10385 Use OUTPUT_NAME property instead of CMAKE_BUILD_TYPE
Revert CMAKE_BUILD_TYPE for matches - need to redesign