From 91679c53cf83dff1037d87ed670149d486292f10 Mon Sep 17 00:00:00 2001 From: mark <mark@opencfd> Date: Mon, 28 Nov 2016 22:12:01 +0100 Subject: [PATCH] STYLE: simplify adios rules - now that adios_config flags are largely working in ThirdParty --- wmake/rules/General/ADIOS | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/wmake/rules/General/ADIOS b/wmake/rules/General/ADIOS index f21af336bb..87bda2c752 100644 --- a/wmake/rules/General/ADIOS +++ b/wmake/rules/General/ADIOS @@ -4,16 +4,8 @@ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) sinclude $(RULES)/mplib$(WM_MPLIB) -ADIOS_INC = -I$(ADIOS_ARCH_PATH)/include - -ADIOS_LIBS := \ - -L$(ADIOS_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ - -ladios_$(FOAM_MPI) - -# ADIOS dependent libraries. Eg, after -L/usr/lib64 ... -# Query as sequential to reduce mpi-dependencies - -ADIOS_LIBS += - $(shell $(ADIOS_ARCH_PATH)/bin/adios_config -s -l | sed -e 's@^.*-L/usr/lib[^ ]*@@') +# Obtain compile/link flags via adios_config +ADIOS_INC := $(shell $(ADIOS_ARCH_PATH)/bin/adios_config -c) +ADIOS_LIBS := $(shell $(ADIOS_ARCH_PATH)/bin/adios_config -l) #------------------------------------------------------------------------------ -- GitLab