From e22b7afdfe887197afee9b3f51cbec204bd4fc4e Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Fri, 18 Sep 2015 12:19:45 +0100 Subject: [PATCH] Bugfix: Windows scotch compilation --- etc/prefs.sh.mingw | 2 +- src/decompositionMethods/scotchDecomp/Make/options | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/prefs.sh.mingw b/etc/prefs.sh.mingw index acafa9304..2190e1933 100644 --- a/etc/prefs.sh.mingw +++ b/etc/prefs.sh.mingw @@ -105,7 +105,7 @@ export PARMGRIDGEN_INCLUDE_DIR=$PARMGRIDGEN_DIR/include # System installed Scotch #export SCOTCH_SYSTEM=1 -export SCOTCH_DIR=$WM_THIRD_PARTY_DIR/packages/scotch_6.0.0 +export SCOTCH_DIR=$WM_THIRD_PARTY_DIR/packages/scotch_6.0.4 export SCOTCH_BIN_DIR=$SCOTCH_DIR/bin export SCOTCH_LIB_DIR=$SCOTCH_DIR/lib export SCOTCH_INCLUDE_DIR=$SCOTCH_DIR/include diff --git a/src/decompositionMethods/scotchDecomp/Make/options b/src/decompositionMethods/scotchDecomp/Make/options index 3ac7982b4..5092e51cb 100644 --- a/src/decompositionMethods/scotchDecomp/Make/options +++ b/src/decompositionMethods/scotchDecomp/Make/options @@ -17,6 +17,7 @@ LIB_LIBS = \ -ldecompositionMethods \ -L$(SCOTCH_LIB_DIR) -lscotch \ -L$(SCOTCH_LIB_DIR) -lscotcherrexit \ + -L$(WM_THIRD_PARTY_DIR)/packages/pthreads-w32-2-9-1-release/Pre-built.2/lib/x64 -lpthreadGC2 \ -L$(OPENMPI_DIR)/lib -lmpi #else