zhyang-dev/ThirdParty-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/ThirdParty-6.git synced 2025-12-08 06:57:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

makeCGAL: Updated to handle older operating systems

Browse Source 
which name the 64bit library directory lib rather than lib64

Resolves bug report https://bugs.openfoam.org/view.php?id=2657
This commit is contained in:
Henry Weller
2017-08-11 00:09:47 +01:00
parent 0d8fc2a63c
commit c29f733925
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Allwmake
View File

@ -3,7 +3,7 @@
# ========= | # ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
@ -355,7 +355,7 @@ then
if [ -r $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libCGAL.so ] if [ -r $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libCGAL.so ]
then then
echo " CGAL headers in $CGAL_ARCH_PATH/include" echo " CGAL headers in $CGAL_ARCH_PATH/include"
echo " CGAL libs in $CGAL_ARCH_PATH/lib" echo " CGAL libs in $CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH"
else else
./makeCGAL ./makeCGAL
fi fi

1
makeCGAL
View File

@ -274,6 +274,7 @@ CMAKE_OPTIONS
-DCMAKE_INSTALL_PREFIX=$CGAL_ARCH_PATH \ -DCMAKE_INSTALL_PREFIX=$CGAL_ARCH_PATH \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DWITH_CGAL_Qt5=OFF \ -DWITH_CGAL_Qt5=OFF \
-DCGAL_INSTALL_LIB_DIR=lib$WM_COMPILER_LIB_ARCH \
$configBoost $configGmpMpfr \ $configBoost $configGmpMpfr \
$CGAL_SOURCE_DIR \ $CGAL_SOURCE_DIR \
&& make -j $WM_NCOMPPROCS \ && make -j $WM_NCOMPPROCS \