From 7389969e94ae039c2664e86ba579e34ad4b401f8 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 11 May 2016 14:37:07 +0100 Subject: [PATCH] etc/config.*/settings: Remove unnecessary $WM_COMPILE_OPTION from $FOAM_EXT_LIBBIN Simplified the directory structure in ThirdParty-dev/platforms --- etc/config.csh/settings | 2 +- etc/config.sh/settings | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/config.csh/settings b/etc/config.csh/settings index 55d100610c..d5922e0f08 100644 --- a/etc/config.csh/settings +++ b/etc/config.csh/settings @@ -150,7 +150,7 @@ setenv FOAM_APPBIN $WM_PROJECT_DIR/platforms/$WM_OPTIONS/bin setenv FOAM_LIBBIN $WM_PROJECT_DIR/platforms/$WM_OPTIONS/lib # External (ThirdParty) libraries -setenv FOAM_EXT_LIBBIN $WM_THIRD_PARTY_DIR/platforms/$WM_OPTIONS/lib +setenv FOAM_EXT_LIBBIN $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib # Site-specific directory if ( $?WM_PROJECT_SITE ) then diff --git a/etc/config.sh/settings b/etc/config.sh/settings index aff65057c3..cf520d6a8e 100644 --- a/etc/config.sh/settings +++ b/etc/config.sh/settings @@ -148,7 +148,7 @@ export FOAM_APPBIN=$WM_PROJECT_DIR/platforms/$WM_OPTIONS/bin export FOAM_LIBBIN=$WM_PROJECT_DIR/platforms/$WM_OPTIONS/lib # External (ThirdParty) libraries -export FOAM_EXT_LIBBIN=$WM_THIRD_PARTY_DIR/platforms/$WM_OPTIONS/lib +export FOAM_EXT_LIBBIN=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib # Site-specific directory siteDir="${WM_PROJECT_SITE:-$WM_PROJECT_INST_DIR/site}"