mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-18 17:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge corrections from develop

Browse Source
This commit is contained in:
Allen Byrne 2018-05-25 09:49:21 -05:00
parent 2e5fece907
commit d081b0b0f5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fortran/examples/CMakeLists.txt
View File

@ -54,7 +54,7 @@ foreach (example ${examples})
# LINK_FLAGS $<$<STREQUAL:"x${CMAKE_Fortran_SIMULATE_ID}","xMSVC">:>
# )
if(MSVC)
set_property(TARGET H5_buildiface PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
set_property(TARGET f90_ex_${example} PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE ${WIN_LINK_FLAGS}")
endif()
set_target_properties (f90_ex_${example} PROPERTIES
LINKER_LANGUAGE Fortran

4
java/test/junit.sh.in
View File

@ -224,8 +224,8 @@ CLEAN_DATAFILES_AND_BLDDIR()
INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
INODE_DDIR=`$LS -i -d $BLDDIR | $AWK -F' ' '{print $1}'`
if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
$RM $BLDDIR/JUnit-interface.ert
$RM $BLDDIR/JUnit-interface.txt
$RM $BLDDIR/JUnit-*.ert
$RM $BLDDIR/JUnit-*.txt
fi
}