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

[svn-r11655] Purpose:

Browse Source 
Bug fix

Description:
Fixed a bug when using h5fc and h5c++ with static libraries.
Added high-level C++ and Fortran libraries to h5c++ and h5fc.

Solution:

Platforms tested:
mir, heping, shanti, sleipnir
This commit is contained in:
James Laird 2005-11-01 12:41:48 -05:00
parent 0cc4fba8b7
commit e6930a615e
2 changed files with 16 additions and 4 deletions
c++/src
h5c++.in
fortran/src
h5fc.in

8
c++/src/h5c++.in

@ -251,7 +251,7 @@ if test "x$do_link" = "xyes"; then
shared_link=""
# conditionnaly link with the hl library
if test "X$HL" = "Xhl"; then
libraries=" $libraries -lhdf5_cpp -lhdf5_hl -lhdf5 "
libraries=" $libraries -lhdf5_hl_cpp -lhdf5_cpp -lhdf5_hl -lhdf5 "
else
libraries=" $libraries -lhdf5_cpp -lhdf5 "
fi
@ -289,6 +289,12 @@ if test "x$do_link" = "xyes"; then
-lhdf5_hl)
new_libraries="$new_libraries ${libdir}/libhdf5_hl.a"
;;
-lhdf5_cpp)
new_libraries="$new_libraries ${libdir}/libhdf5_cpp.a"
;;
-lhdf5_hl_cpp)
new_libraries="$new_libraries ${libdir}/libhdf5_hl_cpp.a"
;;
*)
new_libraries="$new_libraries $lib"
;;

12
fortran/src/h5fc.in

@ -236,7 +236,7 @@ if test "x$do_link" = "xyes"; then
shared_link=""
# conditionnaly link with the hl library
if test "X$HL" = "Xhl"; then
libraries=" $libraries -lhdf5_fortran -lhdf5_hl -lhdf5 "
libraries=" $libraries -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 "
else
libraries=" $libraries -lhdf5_fortran -lhdf5 "
fi
@ -256,8 +256,8 @@ if test "x$do_link" = "xyes"; then
fi
if test "x$USE_SHARED_LIB" != "xyes"; then
# The "-lhdf5" & "-lhdf5_hl" flags are in here already...This is a static
# compile though, so change it to the static version (.a) of the library.
# The hdf5 library "-l" flags are in here already. This is a static
# compile though, so change it to the static versions (.a) of the libraries.
new_libraries=""
for lib in $libraries; do
case "$lib" in
@ -267,6 +267,12 @@ if test "x$do_link" = "xyes"; then
-lhdf5_hl)
new_libraries="$new_libraries ${libdir}/libhdf5_hl.a"
;;
-lhdf5_fortran)
new_libraries="$new_libraries ${libdir}/libhdf5_fortran.a"
;;
-lhdf5hl_fortran)
new_libraries="$new_libraries ${libdir}/libhdf5hl_fortran.a"
;;
*)
new_libraries="$new_libraries $lib"
;;