From c57ca0d224a142fd8356e7f8356c86e4a97a6169 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 10 Apr 2019 16:08:21 +0200
Subject: [PATCH] CONFIG: adjust adios config paths
---
wmake/rules/General/ADIOS2 | 7 +++----
wmake/scripts/have_adios2 | 2 --
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/wmake/rules/General/ADIOS2 b/wmake/rules/General/ADIOS2
index c880d0c3b97..62f467196fa 100644
--- a/wmake/rules/General/ADIOS2
+++ b/wmake/rules/General/ADIOS2
@@ -4,10 +4,9 @@
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(DEFAULT_RULES)/mplib$(WM_MPLIB)
-# Obtain prefix and library information via adios2-config
-ADIOS_PREFIX := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --prefix)
-ADIOS_LIBS := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --libs)
+# May need to strip off rpath ...
-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)
#------------------------------------------------------------------------------
diff --git a/wmake/scripts/have_adios2 b/wmake/scripts/have_adios2
index 52798bb137d..19b376258dc 100644
--- a/wmake/scripts/have_adios2
+++ b/wmake/scripts/have_adios2
@@ -114,8 +114,6 @@ have_adios2()
return 2
}
- header="${header%/*}" # Strip one-level (include/adios2/...)
-
# OK
export HAVE_ADIOS2=true
export ADIOS2_ARCH_PATH="$prefix"
--
GitLab