From 8524d022185bf2de9464e84b5510fea3bee8e06c Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 23 Apr 2021 00:22:01 +0200
Subject: [PATCH] STYLE: use full path for decompositionMethods includes
- improves overall consistency and simplifies mpi-specific reuse
(ie, ptscotchDecomp)
---
src/parallel/decompose/kahipDecomp/Make/options | 2 +-
src/parallel/decompose/metisDecomp/Make/options | 2 +-
src/parallel/decompose/ptscotchDecomp/Make/options | 2 +-
src/parallel/decompose/scotchDecomp/Make/options | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/parallel/decompose/kahipDecomp/Make/options b/src/parallel/decompose/kahipDecomp/Make/options
index bcdb4ea4dbc..29522afef0c 100644
--- a/src/parallel/decompose/kahipDecomp/Make/options
+++ b/src/parallel/decompose/kahipDecomp/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
-I$(KAHIP_INC_DIR) \
- -I../decompositionMethods/lnInclude
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
/*
* KaHIP is usually compiled with openmp, but may be missing the
diff --git a/src/parallel/decompose/metisDecomp/Make/options b/src/parallel/decompose/metisDecomp/Make/options
index 924cecca522..013a158dc94 100644
--- a/src/parallel/decompose/metisDecomp/Make/options
+++ b/src/parallel/decompose/metisDecomp/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
-I$(METIS_INC_DIR) \
- -I../decompositionMethods/lnInclude
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
LIB_LIBS = \
-ldecompositionMethods \
diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index 6f302fb6340..31071eb9dda 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -8,7 +8,7 @@ EXE_INC = \
-I$(PTSCOTCH_INC_DIR) \
-I$(SCOTCH_INC_DIR) \
$(PFLAGS) $(PINC) \
- -I../decompositionMethods/lnInclude
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
/*
* The '-lscotch' is a slight hack:
diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
index e269fdd96c6..67239cf8989 100644
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@@ -1,6 +1,6 @@
EXE_INC = \
-I$(SCOTCH_INC_DIR) \
- -I../decompositionMethods/lnInclude
+ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude
LIB_LIBS = \
-ldecompositionMethods \
--
GitLab