makeGcc, makeCGAL: lib -> lib64 on 64bit OSs

Patch contributed by Bruno Santos
Resolves patch request http://bugs.openfoam.org/view.php?id=2114
This commit is contained in:
Henry Weller
2016-06-09 14:36:59 +01:00
parent ce4951579b
commit 17cafd3581
2 changed files with 21 additions and 11 deletions

View File

@ -258,13 +258,13 @@ CMAKE_OPTIONS
echo " ThirdParty : gmp/mpfr"
configGmpMpfr=$(cat <<CMAKE_OPTIONS
-DGMP_INCLUDE_DIR=$GMP_ARCH_PATH/include
-DGMP_LIBRARIES_DIR=$GMP_ARCH_PATH/lib
-DGMP_LIBRARIES=$GMP_ARCH_PATH/lib/libgmp.so
-DGMP_LIBRARIES_DIR=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
-DGMP_LIBRARIES=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libgmp.so
-DGMPXX_INCLUDE_DIR=$GMP_ARCH_PATH/include
-DGMPXX_LIBRARIES=$GMP_ARCH_PATH/lib/libgmpxx.so
-DGMPXX_LIBRARIES=$GMP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libgmpxx.so
-DMPFR_INCLUDE_DIR=$MPFR_ARCH_PATH/include
-DMPFR_LIBRARIES_DIR=$MPFR_ARCH_PATH/lib
-DMPFR_LIBRARIES=$MPFR_ARCH_PATH/lib/libmpfr.so
-DMPFR_LIBRARIES_DIR=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
-DMPFR_LIBRARIES=$MPFR_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpfr.so
CMAKE_OPTIONS
)
else
@ -276,6 +276,7 @@ CMAKE_OPTIONS
cmake \
-DCMAKE_INSTALL_PREFIX=$CGAL_ARCH_PATH \
-DCMAKE_BUILD_TYPE=Release \
-DWITH_CGAL_Qt5=OFF \
$configBoost $configGmpMpfr \
$CGAL_SOURCE_DIR \
&& make -j $WM_NCOMPPROCS \