zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wmake/scripts/wmakeFunctions: Add support for $WM_PROJECT_DIR being a link

Browse Source
This commit is contained in:
Henry Weller
2016-06-15 14:22:33 +01:00
parent b5d7ba3190
commit b2223913d0
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wmake/scripts/wmakeFunctions
View File

@ -23,7 +23,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. # along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# Script # Script
# wdepFunctions # wmakeFunctions
# #
# Description # Description
# Functions to check wmake environment and find .dep and .o files # Functions to check wmake environment and find .dep and .o files
@ -61,9 +61,11 @@ expandPath()
findTarget() findTarget()
{ {
expandPath $WM_PROJECT_DIR
wmpdir=$exPath
expandPath $1 expandPath $1
if [ "$exPath" = "$WM_PROJECT_DIR" \ if [ "$exPath" = "$wmpdir" \
-o "$exPath" = "$HOME" \ -o "$exPath" = "$HOME" \
-o "$exPath" = "/" \ -o "$exPath" = "/" \
] ]
@ -79,12 +81,14 @@ findTarget()
findObjectDir() findObjectDir()
{ {
expandPath $WM_PROJECT_DIR
wmpdir=$exPath
expandPath $1 expandPath $1
if echo $exPath | grep "$WM_PROJECT_DIR" > /dev/null if echo $exPath | grep "$wmpdir" > /dev/null
then then
platformPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS} platformPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS}
objectsDir=$platformPath$(echo $exPath | sed s%$WM_PROJECT_DIR%% ) objectsDir=$platformPath$(echo $exPath | sed s%$wmpdir%% )
else else
path=$exPath path=$exPath
dir=. dir=.