Erik Schnetter
2016-03-10 19:51:30 UTC
Frank
The other typo (missing "-z" after the last "-a") is still there.
Also, I still think that the logic for this package should be the same
as the logic for all other packages. Whether HDF5 is built or not
should only depend on the setting of HDF5_DIR, not on other variables.
Things are complicated enough as they are, and this just makes things
more difficult to understand.
-erik
The other typo (missing "-z" after the last "-a") is still there.
Also, I still think that the logic for this package should be the same
as the logic for all other packages. Whether HDF5 is built or not
should only depend on the setting of HDF5_DIR, not on other variables.
Things are complicated enough as they are, and this just makes things
more difficult to understand.
-erik
User: knarf
Date: 2016/03/10 12:56 PM
/trunk/src/
detect.sh
fix typo in HDF5_LIB_DIRS
Directory: /trunk/src/
======================
File [modified]: detect.sh
Delta lines: +1 -1
===================================================================
--- trunk/src/detect.sh 2016-02-22 15:46:53 UTC (rev 129)
+++ trunk/src/detect.sh 2016-03-10 18:56:56 UTC (rev 130)
@@ -56,7 +56,7 @@
HDF5_REQ_LIBS="${HDF5_CXX_LIBS} ${HDF5_FORTRAN_LIBS} ${HDF5_C_LIBS}"
# Try to find the library if build isn't explicitly requested
-if [ -z "${HDF5_BUILD}" -a -z "${HDF5_INC_DIRS}" -a -z "${HDF_LIB_DIRS}" -a "${HDF5_LIBS}" ]; then
+if [ -z "${HDF5_BUILD}" -a -z "${HDF5_INC_DIRS}" -a -z "${HDF5_LIB_DIRS}" -a "${HDF5_LIBS}" ]; then
find_lib HDF5 hdf5 1 1.0 "$HDF5_REQ_LIBS" "hdf5.h" "$HDF5_DIR"
# Sadly, pkg-config for HDF5 is good for paths, but bad for the list of
_______________________________________________
Commits mailing list
http://cactuscode.org/mailman/listinfo/commits
Date: 2016/03/10 12:56 PM
/trunk/src/
detect.sh
fix typo in HDF5_LIB_DIRS
Directory: /trunk/src/
======================
File [modified]: detect.sh
Delta lines: +1 -1
===================================================================
--- trunk/src/detect.sh 2016-02-22 15:46:53 UTC (rev 129)
+++ trunk/src/detect.sh 2016-03-10 18:56:56 UTC (rev 130)
@@ -56,7 +56,7 @@
HDF5_REQ_LIBS="${HDF5_CXX_LIBS} ${HDF5_FORTRAN_LIBS} ${HDF5_C_LIBS}"
# Try to find the library if build isn't explicitly requested
-if [ -z "${HDF5_BUILD}" -a -z "${HDF5_INC_DIRS}" -a -z "${HDF_LIB_DIRS}" -a "${HDF5_LIBS}" ]; then
+if [ -z "${HDF5_BUILD}" -a -z "${HDF5_INC_DIRS}" -a -z "${HDF5_LIB_DIRS}" -a "${HDF5_LIBS}" ]; then
find_lib HDF5 hdf5 1 1.0 "$HDF5_REQ_LIBS" "hdf5.h" "$HDF5_DIR"
# Sadly, pkg-config for HDF5 is good for paths, but bad for the list of
_______________________________________________
Commits mailing list
http://cactuscode.org/mailman/listinfo/commits
--
Erik Schnetter <***@cct.lsu.edu>
http://www.perimeterinstitute.ca/personal/eschnetter/
Erik Schnetter <***@cct.lsu.edu>
http://www.perimeterinstitute.ca/personal/eschnetter/