Merge branch 'develop'

SystemsGenetics · Jul 21, 2020 · 4e13e62 · 4e13e62
2 parents 78d0f13 + 9f0dfcd
commit 4e13e62
Show file tree

Hide file tree

Showing 38 changed files with 1,608 additions and 388 deletions.
diff --git a/Makefile b/Makefile
@@ -1,12 +1,13 @@
 
 DEBUG ?= 0
 INSTALL_PREFIX ?= /usr/local
+LINK_MPI_CXX ?= 
 
 MAKE = make
 BUILD = build
 SRC = src
 
-QMAKEFLAGS = PREFIX=$(INSTALL_PREFIX)
+QMAKEFLAGS = PREFIX=$(INSTALL_PREFIX)  LINK_MPI_CXX=$(LINK_MPI_CXX)
 
 ifeq ($(DEBUG), 1)
 QMAKEFLAGS += CONFIG+=debug