zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: adjust adios config paths

Browse Source
This commit is contained in:
Mark Olesen
2019-04-10 16:08:21 +02:00
committed by Andrew Heather
parent e79cdf9f8f
commit eb6ccdf7b1
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wmake/rules/General/ADIOS2
View File

@ -4,10 +4,9 @@
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB) sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
# Obtain prefix and library information via adios2-config # May need to strip off rpath ...
ADIOS_PREFIX := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --prefix)
ADIOS_LIBS := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --libs)
ADIOS_INC = -I${ADIOS_PREFIX}/include ADIOS_FLAGS := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --cxx-flags)
ADIOS_LIBS := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --cxx-libs)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

2
wmake/scripts/have_adios2
View File

@ -114,8 +114,6 @@ have_adios2()
return 2 return 2
} }
header="${header%/*}" # Strip one-level (include/adios2/...)
# OK # OK
export HAVE_ADIOS2=true export HAVE_ADIOS2=true
export ADIOS2_ARCH_PATH="$prefix" export ADIOS2_ARCH_PATH="$prefix"