mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-30 15:32:37 +08:00
[svn-r9650] Purpose:
added support for the hl library int the c++ examples Description: Solution: Platforms tested: linux Misc. update:
This commit is contained in:
parent
e7e76b6876
commit
b1df0a57aa
@ -25,7 +25,7 @@ HDF_CXX="yes"
|
||||
|
||||
## Replace building CC with the just installed h5cc
|
||||
CXX=$(bindir)/h5c++
|
||||
CPPFLAGS=-I. -I$(srcdir)
|
||||
CPPFLAGS=-I. -I$(srcdir) -I$(top_srcdir)/hl/src
|
||||
CFLAGS=
|
||||
|
||||
hdf5_srcdir=$(top_srcdir)/src
|
||||
|
@ -27,6 +27,7 @@ prefix="@prefix@"
|
||||
exec_prefix="@exec_prefix@"
|
||||
libdir="@libdir@"
|
||||
includedir="@includedir@"
|
||||
HL="@HL@"
|
||||
|
||||
############################################################################
|
||||
## ##
|
||||
@ -237,7 +238,12 @@ if test "x$do_compile" = "xyes"; then
|
||||
fi
|
||||
|
||||
if test "x$do_link" = "xyes"; then
|
||||
link_args="$link_args ${libdir}/libhdf5_cpp.a ${libdir}/libhdf5.a $LIBS"
|
||||
# conditionnaly link with the hl library
|
||||
if test "X$HL" = "Xhl"; then
|
||||
link_args="$link_args ${libdir}/libhdf5_cpp.a ${libdir}/libhdf5.a ${libdir}/libhdf5_hl.a $LIBS"
|
||||
else
|
||||
link_args="$link_args ${libdir}/libhdf5_cpp.a ${libdir}/libhdf5.a $LIBS"
|
||||
fi
|
||||
$SHOW $CXXLINKER -I$includedir $CPPFLAGS $CXXFLAGS $LDFLAGS $clibpath $link_objs $link_args
|
||||
status=$?
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user