Skip to content

Commit 52f92e5

Browse files
lindsayadlindsayad
authored
Merge pull request #3645 from lindsayad/no-hdf5-cxx-fort
Remove fortran/cxx hdf5 detection/linkage
2 parents 1dc3fa1 + d6c012b commit 52f92e5

106 files changed

Lines changed: 0 additions & 327 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7094,9 +7094,7 @@ HAVE_DOT = @HAVE_DOT@
70947094
HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
70957095
HDF5_CFLAGS = @HDF5_CFLAGS@
70967096
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
7097-
HDF5_CXXLIBS = @HDF5_CXXLIBS@
70987097
HDF5_DIR = @HDF5_DIR@
7099-
HDF5_FLIBS = @HDF5_FLIBS@
71007098
HDF5_LIBS = @HDF5_LIBS@
71017099
HDF5_PREFIX = @HDF5_PREFIX@
71027100
INSTALL = @INSTALL@

‎configure‎

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -718,8 +718,6 @@ XML2_CONFIG
718718
LIBMESH_ENABLE_HDF5_FALSE
719719
LIBMESH_ENABLE_HDF5_TRUE
720720
HDF5_PREFIX
721-
HDF5_CXXLIBS
722-
HDF5_FLIBS
723721
HDF5_LIBS
724722
HDF5_CPPFLAGS
725723
HDF5_CFLAGS
@@ -55190,16 +55188,12 @@ if test "x${with_hdf5}" != "xno"; then :
5519055188
if test -d "${HDF5_PREFIX}/lib"; then :
5519155189

5519255190
HDF5_LIBS="-L${HDF5_PREFIX}/lib -lhdf5"
55193-
HDF5_FLIBS="-L${HDF5_PREFIX}/lib -lhdf5_fortran"
55194-
HDF5_CXXLIBS="-L${HDF5_PREFIX}/lib -lhdf5_cpp"
5519555191

5519655192
fi
5519755193

5519855194
if test "x$RPATHFLAG" != "x" && test -d "${HDF5_PREFIX}/lib"; then :
5519955195

5520055196
HDF5_LIBS="${HDF5_LIBS} ${RPATHFLAG}${HDF5_PREFIX}/lib"
55201-
HDF5_FLIBS="${HDF5_FLIBS} ${RPATHFLAG}${HDF5_PREFIX}/lib"
55202-
HDF5_CXXLIBS="${HDF5_CXXLIBS} ${RPATHFLAG}${HDF5_PREFIX}/lib"
5520355197

5520455198
fi
5520555199

@@ -55262,7 +55256,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
5526255256
if test "x${found_header}" = "xyes"; then :
5526355257

5526455258
min_version_succeeded=no
55265-
hdf5_has_cxx=no
5526655259

5526755260
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5526855261
/* end confdefs.h. */
@@ -55359,69 +55352,6 @@ else
5535955352
fi
5536055353

5536155354

55362-
ac_ext=cpp
55363-
ac_cpp='$CXXCPP $CPPFLAGS'
55364-
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
55365-
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
55366-
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
55367-
55368-
55369-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking If HDF5 C++ interface is present" >&5
55370-
$as_echo_n "checking If HDF5 C++ interface is present... " >&6; }
55371-
55372-
LIBS="${HDF5_LIBS} ${HDF5_CXXLIBS}"
55373-
55374-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
55375-
/* end confdefs.h. */
55376-
55377-
#include <H5Cpp.h>
55378-
#ifndef H5_NO_NAMESPACE
55379-
using namespace H5;
55380-
#endif
55381-
55382-
int
55383-
main ()
55384-
{
55385-
55386-
H5std_string fname("test.h5");
55387-
H5File file (fname, H5F_ACC_TRUNC);
55388-
55389-
;
55390-
return 0;
55391-
}
55392-
_ACEOF
55393-
if ac_fn_cxx_try_link "$LINENO"; then :
55394-
55395-
hdf5_has_cxx=yes
55396-
55397-
else
55398-
55399-
hdf5_has_cxx=no
55400-
55401-
fi
55402-
rm -f core conftest.err conftest.$ac_objext \
55403-
conftest$ac_exeext conftest.$ac_ext
55404-
55405-
ac_ext=c
55406-
ac_cpp='$CPP $CPPFLAGS'
55407-
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
55408-
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
55409-
ac_compiler_gnu=$ac_cv_c_compiler_gnu
55410-
55411-
55412-
if test "x$hdf5_has_cxx" = "xyes"; then :
55413-
55414-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
55415-
$as_echo "yes" >&6; }
55416-
55417-
$as_echo "#define HAVE_HDF5_CXX 1" >>confdefs.h
55418-
55419-
55420-
else
55421-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
55422-
$as_echo "no" >&6; }
55423-
fi
55424-
5542555355
succeeded=no
5542655356
if test "x$found_header" = "xyes" && test "x$min_version_succeeded" = "xyes" && test "x$found_library" = "xyes"; then :
5542755357
succeeded=yes
@@ -55446,8 +55376,6 @@ fi
5544655376
HDF5_CFLAGS=""
5544755377
HDF5_CPPFLAGS=""
5544855378
HDF5_LIBS=""
55449-
HDF5_FLIBS=""
55450-
HDF5_CXXLIBS=""
5545155379
HDF5_PREFIX=""
5545255380

5545355381
else
@@ -55461,8 +55389,6 @@ $as_echo "#define HAVE_HDF5 1" >>confdefs.h
5546155389

5546255390

5546355391

55464-
55465-
5546655392
fi
5546755393

5546855394
fi

‎contrib/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,9 +594,7 @@ HAVE_DOT = @HAVE_DOT@
594594
HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
595595
HDF5_CFLAGS = @HDF5_CFLAGS@
596596
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
597-
HDF5_CXXLIBS = @HDF5_CXXLIBS@
598597
HDF5_DIR = @HDF5_DIR@
599-
HDF5_FLIBS = @HDF5_FLIBS@
600598
HDF5_LIBS = @HDF5_LIBS@
601599
HDF5_PREFIX = @HDF5_PREFIX@
602600
INSTALL = @INSTALL@

‎contrib/boost/include/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1979,9 +1979,7 @@ HAVE_DOT = @HAVE_DOT@
19791979
HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
19801980
HDF5_CFLAGS = @HDF5_CFLAGS@
19811981
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
1982-
HDF5_CXXLIBS = @HDF5_CXXLIBS@
19831982
HDF5_DIR = @HDF5_DIR@
1984-
HDF5_FLIBS = @HDF5_FLIBS@
19851983
HDF5_LIBS = @HDF5_LIBS@
19861984
HDF5_PREFIX = @HDF5_PREFIX@
19871985
INSTALL = @INSTALL@

‎contrib/capnproto/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,7 @@ HAVE_DOT = @HAVE_DOT@
446446
HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
447447
HDF5_CFLAGS = @HDF5_CFLAGS@
448448
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
449-
HDF5_CXXLIBS = @HDF5_CXXLIBS@
450449
HDF5_DIR = @HDF5_DIR@
451-
HDF5_FLIBS = @HDF5_FLIBS@
452450
HDF5_LIBS = @HDF5_LIBS@
453451
HDF5_PREFIX = @HDF5_PREFIX@
454452
INSTALL = @INSTALL@

‎contrib/eigen/gitshim/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,7 @@ HAVE_DOT = @HAVE_DOT@
330330
HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
331331
HDF5_CFLAGS = @HDF5_CFLAGS@
332332
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
333-
HDF5_CXXLIBS = @HDF5_CXXLIBS@
334333
HDF5_DIR = @HDF5_DIR@
335-
HDF5_FLIBS = @HDF5_FLIBS@
336334
HDF5_LIBS = @HDF5_LIBS@
337335
HDF5_PREFIX = @HDF5_PREFIX@
338336
INSTALL = @INSTALL@

‎contrib/exodusii/5.22b/exodus/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3313,9 +3313,7 @@ HAVE_DOT = @HAVE_DOT@
33133313
HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
33143314
HDF5_CFLAGS = @HDF5_CFLAGS@
33153315
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
3316-
HDF5_CXXLIBS = @HDF5_CXXLIBS@
33173316
HDF5_DIR = @HDF5_DIR@
3318-
HDF5_FLIBS = @HDF5_FLIBS@
33193317
HDF5_LIBS = @HDF5_LIBS@
33203318
HDF5_PREFIX = @HDF5_PREFIX@
33213319
INSTALL = @INSTALL@

‎contrib/exodusii/5.22b/nemesis/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,7 @@ HAVE_DOT = @HAVE_DOT@
391391
HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
392392
HDF5_CFLAGS = @HDF5_CFLAGS@
393393
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
394-
HDF5_CXXLIBS = @HDF5_CXXLIBS@
395394
HDF5_DIR = @HDF5_DIR@
396-
HDF5_FLIBS = @HDF5_FLIBS@
397395
HDF5_LIBS = @HDF5_LIBS@
398396
HDF5_PREFIX = @HDF5_PREFIX@
399397
INSTALL = @INSTALL@

‎contrib/exodusii/Lib/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,9 +1948,7 @@ HAVE_DOT = @HAVE_DOT@
19481948
HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
19491949
HDF5_CFLAGS = @HDF5_CFLAGS@
19501950
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
1951-
HDF5_CXXLIBS = @HDF5_CXXLIBS@
19521951
HDF5_DIR = @HDF5_DIR@
1953-
HDF5_FLIBS = @HDF5_FLIBS@
19541952
HDF5_LIBS = @HDF5_LIBS@
19551953
HDF5_PREFIX = @HDF5_PREFIX@
19561954
INSTALL = @INSTALL@

‎contrib/exodusii/v8.11/exodus/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4241,9 +4241,7 @@ HAVE_DOT = @HAVE_DOT@
42414241
HAVE_GCOV_TOOLS = @HAVE_GCOV_TOOLS@
42424242
HDF5_CFLAGS = @HDF5_CFLAGS@
42434243
HDF5_CPPFLAGS = @HDF5_CPPFLAGS@
4244-
HDF5_CXXLIBS = @HDF5_CXXLIBS@
42454244
HDF5_DIR = @HDF5_DIR@
4246-
HDF5_FLIBS = @HDF5_FLIBS@
42474245
HDF5_LIBS = @HDF5_LIBS@
42484246
HDF5_PREFIX = @HDF5_PREFIX@
42494247
INSTALL = @INSTALL@

0 commit comments

Comments
 (0)