Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Mark Olesen
2019-04-08 12:05:24 +02:00
committed by Andrew Heather
15 changed files with 96 additions and 74 deletions

View File

@ -162,8 +162,8 @@ else
endif
# Shared site (group) executables/libraries
setenv FOAM_SITE_APPBIN "$siteDir/$WM_PROJECT_VERSION/platforms/$WM_OPTIONS/bin"
setenv FOAM_SITE_LIBBIN "$siteDir/$WM_PROJECT_VERSION/platforms/$WM_OPTIONS/lib"
setenv FOAM_SITE_APPBIN "$siteDir/$FOAM_API/platforms/$WM_OPTIONS/bin"
setenv FOAM_SITE_LIBBIN "$siteDir/$FOAM_API/platforms/$WM_OPTIONS/lib"
# User executables/libraries
setenv FOAM_USER_APPBIN "$WM_PROJECT_USER_DIR/platforms/$WM_OPTIONS/bin"