diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-03-24 03:55:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-24 03:55:18 (GMT) |
| commit | 7fd9a4435f80fad41992f1e71b94c4ff2be887ba (patch) | |
| tree | 4a42b7ae1df8089afb2983b5b985236ced6820ce | |
| parent | af2666013f548ec41263bd164ab03741086ba563 (diff) | |
| download | hdf5-7fd9a4435f80fad41992f1e71b94c4ff2be887ba.zip hdf5-7fd9a4435f80fad41992f1e71b94c4ff2be887ba.tar.gz hdf5-7fd9a4435f80fad41992f1e71b94c4ff2be887ba.tar.bz2 | |
Fix minor things noted when doing 1.10 merges (#2610)
* Duplicated HDF_RESOURCES_DIR from cmake_ext_mod merge
* Typos in comments
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | bin/checkposix | 4 | ||||
| -rw-r--r-- | java/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | release_docs/INSTALL_Cygwin.txt | 2 | ||||
| -rw-r--r-- | src/H5private.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba0e51b..c2679dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -640,7 +640,7 @@ else () endif () include (${HDF_RESOURCES_DIR}/HDFCompilerFlags.cmake) -set (CMAKE_MODULE_PATH ${HDF_RESOURCES_DIR} ${HDF_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) +set (CMAKE_MODULE_PATH ${HDF_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) #----------------------------------------------------------------------------- # Option to Enable HDFS diff --git a/bin/checkposix b/bin/checkposix index ee12d44..bb6b81b 100755 --- a/bin/checkposix +++ b/bin/checkposix @@ -103,7 +103,7 @@ foreach $arg (@ARGV) { # Now find all function calls on this line which don't start with 'H' while (($name)=/\b([a-z_A-GI-Z]\w*)\s*\(/) { $_ = $'; - + # Ignore C statements that look sort of like function # calls. next if $name =~ /^(if|for|offsetof|return|sizeof|switch|while|void)$/; @@ -186,7 +186,7 @@ foreach $arg (@ARGV) { } # TESTING (not comprehensive - just noise reduction) - + # Test macros and functions (testhdf5.h) next if $name =~ /^(AddTest|TestErrPrintf|TestSummary|TestCleanup|TestShutdown)$/; next if $name =~ /^(CHECK|CHECK_PTR|CHECK_PTR_NULL|CHECK_PTR_EQ|CHECK_I)$/; diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index 86fab9d..ae37ceb 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required (VERSION 3.18) project (HDF5_JAVA C Java) -set (CMAKE_MODULE_PATH "${HDF_RESOURCES_DIR};${HDF_RESOURCES_DIR}") +set (CMAKE_MODULE_PATH "${HDF_RESOURCES_DIR}") find_package (Java) #----------------------------------------------------------------------------- diff --git a/release_docs/INSTALL_Cygwin.txt b/release_docs/INSTALL_Cygwin.txt index 34d3e5a..b3c8a83 100644 --- a/release_docs/INSTALL_Cygwin.txt +++ b/release_docs/INSTALL_Cygwin.txt @@ -2,7 +2,7 @@ HDF5 Build and Install Instructions for Cygwin ************************************************************************ -This document is a instruction on how to build, test and install HDF5 library on +This document is an instruction on how to build, test and install HDF5 library on Cygwin. See detailed information in hdf5/INSTALL. NOTE: hdf5 can be built with CMake, see the INSTALL_CMake.txt file for more guidance. diff --git a/src/H5private.h b/src/H5private.h index 6ed0aa2..ec77bbb 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1932,7 +1932,7 @@ typedef struct H5_api_struct { #define H5_FIRST_THREAD_INIT pthread_once(&H5TS_first_init_g, H5TS_pthread_first_thread_init); #endif -/* Macros for threadsafe HDF-5 Phase I locks */ +/* Macros for threadsafe HDF5 Phase I locks */ #define H5_API_LOCK H5TS_mutex_lock(&H5_g.init_lock); #define H5_API_UNLOCK H5TS_mutex_unlock(&H5_g.init_lock); |