Skip to content
Snippets Groups Projects
Commit ba8fa9f2 authored by Henry Weller's avatar Henry Weller Committed by Mark OLESEN
Browse files

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

parent e8885c86
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,7 @@ ...@@ -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() ...@@ -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() ...@@ -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=.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment