mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-05 15:42:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor things noted when doing 1.10 merges (#2610)

Browse Source 
* Duplicated HDF_RESOURCES_DIR from cmake_ext_mod merge
* Typos in comments
This commit is contained in:
Dana Robinson 2023-03-23 20:55:18 -07:00 committed by GitHub
parent af2666013f
commit 7fd9a4435f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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

4
bin/checkposix
View File

@ -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)$/;

2
java/CMakeLists.txt
View File

@ -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)
#-----------------------------------------------------------------------------

2
release_docs/INSTALL_Cygwin.txt
View File

@ -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.

2
src/H5private.h
View File

@ -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);