Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openfoam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
openfoam
Commits
ba8fa9f2
Commit
ba8fa9f2
authored
9 years ago
by
Henry Weller
Committed by
Mark OLESEN
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
wmake/scripts/wmakeFunctions
+8
-4
8 additions, 4 deletions
wmake/scripts/wmakeFunctions
with
8 additions
and
4 deletions
wmake/scripts/wmakeFunctions
+
8
−
4
View file @
ba8fa9f2
...
@@ -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
# w
dep
Functions
# w
make
Functions
#
#
# 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
=
.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment