diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-25 14:49:21 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-25 14:49:21 (GMT) |
| commit | d081b0b0f5fa86637c30b0a675c455a352071bbe (patch) | |
| tree | c27efcb7b3e999cbf5fdc6ddaa488b0c744f3111 | |
| parent | 2e5fece9077102d712a9fa9ec32d3be870ebee19 (diff) | |
| download | hdf5-d081b0b0f5fa86637c30b0a675c455a352071bbe.zip hdf5-d081b0b0f5fa86637c30b0a675c455a352071bbe.tar.gz hdf5-d081b0b0f5fa86637c30b0a675c455a352071bbe.tar.bz2 | |
Merge corrections from develop
| -rw-r--r-- | fortran/examples/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | java/test/junit.sh.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt index c836c17..68b817e 100644 --- a/fortran/examples/CMakeLists.txt +++ b/fortran/examples/CMakeLists.txt @@ -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 diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index c74d2e0..07c3242 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -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 } |