diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-24 20:31:44 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-24 20:31:44 (GMT) |
| commit | 563a17cec0fd71f2242f0a48cf85f2522af66240 (patch) | |
| tree | 800912cca9141df963044033612bbf54956184c9 | |
| parent | 7b81d526a3af50444c0379c71dea2248337bcc1b (diff) | |
| parent | 7c74d1f026cc76d5aa33a10da7b8cffef0ad7cda (diff) | |
| download | hdf5-563a17cec0fd71f2242f0a48cf85f2522af66240.zip hdf5-563a17cec0fd71f2242f0a48cf85f2522af66240.tar.gz hdf5-563a17cec0fd71f2242f0a48cf85f2522af66240.tar.bz2 | |
Merge pull request #1084 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '7c74d1f026cc76d5aa33a10da7b8cffef0ad7cda':
Correct script names
Fix typo
| -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 } |