From fd44270f968f9b3ea89191225caaecbc37d22856 Mon Sep 17 00:00:00 2001 From: "Christoph Goniva, DCS Computing GmbH" Date: Mon, 5 Jan 2015 13:56:45 +0100 Subject: [PATCH] update Make/files --- src/lagrangian/cfdemParticle/Make/files | 5 +++++ src/lagrangian/cfdemParticle/Make/options | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/lagrangian/cfdemParticle/Make/files b/src/lagrangian/cfdemParticle/Make/files index 192b1043..c322716f 100644 --- a/src/lagrangian/cfdemParticle/Make/files +++ b/src/lagrangian/cfdemParticle/Make/files @@ -1,4 +1,5 @@ cfdemCloud = cfdemCloud +cfdTools = cfdTools forceModels = subModels/forceModel forceSubModels = subModels/forceModel/forceSubModels forceModelsMS = subModels/forceModelMS @@ -19,11 +20,15 @@ $(cfdemCloud)/cfdemCloud.C derived/cfdemCloudIB/cfdemCloudIB.C derived/cfdemCloudMS/cfdemCloudMS.C +$(cfdTools)/global.C +$(cfdTools)/newGlobal.C + $(forceModels)/forceModel/forceModel.C $(forceModels)/forceModel/newForceModel.C $(forceModels)/noDrag/noDrag.C $(forceModels)/checkCouplingInterval/checkCouplingInterval.C $(forceModels)/DiFeliceDrag/DiFeliceDrag.C +$(forceModels)/fieldStore/fieldStore.C $(forceModels)/GidaspowDrag/GidaspowDrag.C $(forceModels)/SchillerNaumannDrag/SchillerNaumannDrag.C $(forceModels)/Archimedes/Archimedes.C diff --git a/src/lagrangian/cfdemParticle/Make/options b/src/lagrangian/cfdemParticle/Make/options index ce6613b3..93a3e147 100644 --- a/src/lagrangian/cfdemParticle/Make/options +++ b/src/lagrangian/cfdemParticle/Make/options @@ -1,6 +1,9 @@ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) sinclude $(RULES)/mplib$(WM_MPLIB) +GIT_VERSION := $(shell git describe --abbrev=4 --dirty --always --tags) +PFLAGS+= -DGITVERSION=\"$(GIT_VERSION)\" + EXE_INC = \ $(PFLAGS) \