Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
a3d4eb56
Commit
a3d4eb56
authored
Mar 22, 2010
by
mattijs
Browse files
BUG: Resolved (my own) conflict.
parent
5d93fbe1
Changes
2
Hide whitespace changes
Inline
Side-by-side
etc/settings.csh
View file @
a3d4eb56
...
...
@@ -70,19 +70,9 @@ setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
# add OpenFOAM scripts and wmake to the path
setenv PATH
${
WM_DIR
}
:
${
WM_PROJECT_DIR
}
/bin:
${
PATH
}
<<<<<<
< HEAD
_foamAddPath
$FOAM_APPBIN
_foamAddPath
$FOAM_SITE_APPBIN
_foamAddPath
$FOAM_USER_APPBIN
# Make sure to pick up dummy versions of external libraries last
_foamAddLib
$FOAM_LIBBIN
/dummy
_foamAddLib
$FOAM_LIBBIN
_foamAddLib
$FOAM_SITE_LIBBIN
_foamAddLib
$FOAM_USER_LIBBIN
=======
_foamAddPath
${
FOAM_USER_APPBIN
}
:
${
FOAM_SITE_APPBIN
}
:
${
FOAM_APPBIN
}
_foamAddLib
${
FOAM_USER_LIBBIN
}
:
${
FOAM_SITE_LIBBIN
}
:
${
FOAM_LIBBIN
}
>>>>>>>
00e72ccabdc9912f14f889531e88f60a79c68dcb
# Make sure to pick up dummy versions of external libraries last
_foamAddLib
${
FOAM_USER_LIBBIN
}
:
${
FOAM_SITE_LIBBIN
}
:
${
FOAM_LIBBIN
}
:
${
FOAM_LIBBIN
}
/dummy
# Select compiler installation
...
...
etc/settings.sh
View file @
a3d4eb56
...
...
@@ -94,15 +94,9 @@ export FOAM_RUN=$WM_PROJECT_USER_DIR/run
# add OpenFOAM scripts and wmake to the path
export
PATH
=
$WM_DIR
:
$WM_PROJECT_DIR
/bin:
$PATH
<<<<<<
< HEAD
_foamAddPath
$FOAM_APPBIN
$FOAM_SITE_APPBIN
$FOAM_USER_APPBIN
# Make sure to pick up dummy versions of external libraries last
_foamAddLib
$FOAM_LIBBIN
/dummy
_foamAddLib
$FOAM_LIBBIN
$FOAM_SITE_LIBBIN
$FOAM_USER_LIBBIN
=======
_foamAddPath
$FOAM_USER_APPBIN
:
$FOAM_SITE_APPBIN
:
$FOAM_APPBIN
_foamAddLib
$FOAM_USER_LIBBIN
:
$FOAM_SITE_LIBBIN
:
$FOAM_LIBBIN
>>>>>>>
00e72ccabdc9912f14f889531e88f60a79c68dcb
# Make sure to pick up dummy versions of external libraries last
_foamAddLib
$FOAM_USER_LIBBIN
:
$FOAM_SITE_LIBBIN
:
$FOAM_LIBBIN
:
$FOAM_LIBBIN
/dummy
# Compiler settings
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment