From 3ff44bc2d19fa74ff0079f67a0a8d44cb02c2472 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 15 Jun 2016 14:22:33 +0100 Subject: [PATCH] wmake/scripts/wmakeFunctions: Add support for $WM_PROJECT_DIR being a link --- wmake/scripts/wmakeFunctions | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/wmake/scripts/wmakeFunctions b/wmake/scripts/wmakeFunctions index f0d8ad143..63cbb9f16 100755 --- a/wmake/scripts/wmakeFunctions +++ b/wmake/scripts/wmakeFunctions @@ -23,7 +23,7 @@ # along with OpenFOAM. If not, see . # # Script -# wdepFunctions +# wmakeFunctions # # Description # Functions to check wmake environment and find .dep and .o files @@ -61,9 +61,11 @@ expandPath() findTarget() { + expandPath $WM_PROJECT_DIR + wmpdir=$exPath expandPath $1 - if [ "$exPath" = "$WM_PROJECT_DIR" \ + if [ "$exPath" = "$wmpdir" \ -o "$exPath" = "$HOME" \ -o "$exPath" = "/" \ ] @@ -79,12 +81,14 @@ findTarget() findObjectDir() { + expandPath $WM_PROJECT_DIR + wmpdir=$exPath expandPath $1 - if echo $exPath | grep "$WM_PROJECT_DIR" > /dev/null + if echo $exPath | grep "$wmpdir" > /dev/null then platformPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS} - objectsDir=$platformPath$(echo $exPath | sed s%$WM_PROJECT_DIR%% ) + objectsDir=$platformPath$(echo $exPath | sed s%$wmpdir%% ) else path=$exPath dir=.