put USE_HDF5 in the GNUMake build system (AMReX-Codes#1047)

dwillcox · Oct 3, 2020 · 06a7b20 · 06a7b20
1 parent 63fd846
commit 06a7b20
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/Tests/HDF5Benchmark/GNUmakefile b/Tests/HDF5Benchmark/GNUmakefile
@@ -5,7 +5,7 @@ DEBUG	= FALSE
 
 DIM	= 3
 
-COMP    = gnu 
+COMP    = gnu
 
 PRECISION = DOUBLE
 
@@ -28,11 +28,6 @@ include $(AMREX_HOME)/Tools/GNUMake/Make.rules
 
 USE_HDF5  = TRUE
 HDF5_HOME = $(HOME)/hdf5/develop_build/hdf5
-ifeq ($(USE_HDF5), TRUE)
-DEFINES += -DAMREX_USE_HDF5
-INCLUDE_LOCATIONS += $(HDF5_HOME)/include
-LIBRARIES         += -lhdf5 -lz -ldl -L$(HDF5_HOME)/lib
-endif
 
 # To use HDF5 asynchronous I/O VOL connector, follow the instructions at https://bitbucket.hdfgroup.org/projects/HDF5VOL/repos/async/browse
 USE_HDF5_ASYNC = FALSE

diff --git a/Tests/Slice/GNUmakefile b/Tests/Slice/GNUmakefile
@@ -29,8 +29,3 @@ include $(AMREX_HOME)/Tools/GNUMake/Make.rules
 
 HDF5_HOME   = /global/homes/s/sbyna/software/hdf5develop/install
 USE_HDF5 = FALSE
-ifeq ($(USE_HDF5), TRUE)
-DEFINES += -DBL_HDF5 
-INCLUDE_LOCATIONS += $(HDF5_HOME)/include
-LIBRARIES         += -lhdf5 -L$(HDF5_HOME)/lib
-endif
diff --git a/Tools/GNUMake/Make.defs b/Tools/GNUMake/Make.defs
@@ -282,6 +282,12 @@ else
   USE_SENSEI_INSITU := FALSE
 endif
 
+ifdef USE_HDF5
+  USE_HDF5 := $(strip $(USE_HDF5))
+else
+  USE_HDF5 := FALSE
+endif
+
 ifdef EBASE
   EBASE := $(strip $(EBASE))
 else
@@ -964,6 +970,11 @@ ifeq ($(USE_SENSEI_INSITU),TRUE)
   include        $(AMREX_HOME)/Tools/GNUMake/tools/Make.sensei
 endif
 
+ifeq ($(USE_HDF5),TRUE)
+  $(info Loading $(AMREX_HOME)/Tools/GNUMake/packages/Make.hdf5...)
+  include        $(AMREX_HOME)/Tools/GNUMake/packages/Make.hdf5
+endif
+
 ifneq ("$(wildcard $(AMREX_HOME)/Tools/GNUMake/Make.local)","")
   $(info Loading $(AMREX_HOME)/Tools/GNUMake/Make.local...)
   include        $(AMREX_HOME)/Tools/GNUMake/Make.local

diff --git a/Tools/GNUMake/packages/Make.hdf5 b/Tools/GNUMake/packages/Make.hdf5
@@ -0,0 +1,19 @@
+CPPFLAGS += -DAMREX_USE_HDF5
+
+ifndef AMREX_HDF5_HOME
+ifdef HDF5_DIR
+  AMREX_HDF5_HOME = $(HDF5_DIR)
+endif
+ifdef HDF5_HOME
+  AMREX_HDF5_HOME = $(HDF5_HOME)
+endif
+endif
+
+LIBRARIES += -lhdf5 -lz -ldl
+
+ifdef AMREX_HDF5_HOME
+  HDF5_ABSPATH = $(abspath $(AMREX_HDF5_HOME))
+  INCLUDE_LOCATIONS += $(HDF5_ABSPATH)/include
+  LIBRARY_LOCATIONS += $(HDF5_ABSPATH)/lib
+  LDFLAGS += -Xlinker=-rpath -Xlinker=$(HDF5_ABSPATH)/lib
+endif