From 8c8dd9ba0aac858b0bbbfeafaf975cac81c8d72d Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Fri, 11 Dec 2020 00:14:59 +0100
Subject: [PATCH] simplified

---
 Makefile | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 418d70507..102b954bd 100644
--- a/Makefile
+++ b/Makefile
@@ -2,27 +2,20 @@ SHELL = /bin/sh
 ########################################################################################
 # Makefile for the installation of DAMASK
 ########################################################################################
-DAMASK_ROOT = $(shell python3 -c "import os,sys; print(os.path.normpath(os.path.realpath(os.path.expanduser('$(pwd)'))))")
 .PHONY: all
 all: grid mesh processing
 
 .PHONY: grid
-grid: build/grid
-	@(cd build/grid;make -j${DAMASK_NUM_THREADS} all install;)
+grid:
+	@cmake -B build/grid -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=${PWD} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP}
+	@cmake --build build/grid --parallel ${DAMASK_NUM_THRADS}
+	@cmake --install build/grid
 
 .PHONY: mesh
-mesh: build/mesh
-	@(cd build/mesh; make -j${DAMASK_NUM_THREADS} all install;)
-
-.PHONY: build/grid
-build/grid:
-	@mkdir -p build/grid
-	@(cd build/grid; cmake -Wno-dev -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=${DAMASK_ROOT} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;)
-
-.PHONY: build/mesh
-build/mesh:
-	@mkdir -p build/mesh
-	@(cd build/mesh; cmake -Wno-dev -DDAMASK_SOLVER=MESH -DCMAKE_INSTALL_PREFIX=${DAMASK_ROOT}  -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;)
+mesh:
+	@cmake -B build/mesh -DDAMASK_SOLVER=MESH -DCMAKE_INSTALL_PREFIX=${PWD} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP}
+	@cmake --build build/mesh --parallel ${DAMASK_NUM_THRADS}
+	@cmake --install build/mesh
 
 .PHONY: clean
 clean: