diff --git a/etc/settings.csh b/etc/settings.csh index 0a425f85144d87bd9d5b1e7c5ed9af1960d129e9..b6bcf8a9d2ed42cc0945dedd9f22ebe1ce663a8b 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -88,22 +88,22 @@ case OpenFOAM: switch ("$WM_COMPILER") case Gcc: setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.4.3/platforms/$WM_ARCH$WM_COMPILER_ARCH - setenv MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.2 - setenv MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH + setenv MPFR_HOME $WM_THIRD_PARTY_DIR/mpfr-2.4.2 + setenv MPFR_ARCH_PATH $MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH _foamAddLib $MPFR_ARCH_PATH/lib _foamAddLib $WM_THIRD_PARTY_DIR/gmp-5.0.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib breaksw case Gcc442: setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH - setenv MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1 - setenv MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH + setenv MPFR_HOME $WM_THIRD_PARTY_DIR/mpfr-2.4.1 + setenv MPFR_ARCH_PATH $MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH _foamAddLib $MPFR_ARCH_PATH/lib _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib breaksw case Gcc43: setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH - setenv MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1 - setenv MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH + setenv MPFR_HOME $WM_THIRD_PARTY_DIR/mpfr-2.4.1 + setenv MPFR_ARCH_PATH $MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH _foamAddLib $MPFR_ARCH_PATH/lib _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib breaksw @@ -254,10 +254,10 @@ endif # CGAL and boost # ~~~~~~~~~~~~~~ set cgal_version=3.5.1 -setenv CGAL_SRC=$WM_THIRD_PARTY_DIR/CGAL-$cgal_version +setenv CGAL_SRC $WM_THIRD_PARTY_DIR/CGAL-$cgal_version set boost_version=1_42_0 -setenv BOOST_ROOT=$WM_THIRD_PARTY_DIR/boost_$boost_version +setenv BOOST_ROOT $WM_THIRD_PARTY_DIR/boost_$boost_version _foamAddLib $BOOST_ROOT/platforms/$WM_OPTIONS/lib _foamAddLib $CGAL_SRC/lib