zhyang-dev/ThirdParty-common
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/ThirdParty-common.git synced 2025-12-08 06:57:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: missing check for boost, CGAL lib64/ in Allwmake

Browse Source 
- Non-critical since makeCGAL still caught things anyhow.

- Also report the correct locations.
This commit is contained in:
mark
2016-11-04 21:02:21 +01:00
parent cb7d48b428
commit 6b8eecffbd
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Allwmake
View File

@ -399,22 +399,21 @@ echo
echo ======================================== echo ========================================
echo Build CGAL echo Build CGAL
if [ -d "$CGAL_ARCH_PATH/include" \ if [ -d "$CGAL_ARCH_PATH/include" \
-a -r "$CGAL_ARCH_PATH/lib/libCGAL.so" ] -a -r "$CGAL_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libCGAL.so" ]
then then
# first some information about boost # first some information about boost
if [ -d "$BOOST_ARCH_PATH/include/boost" \ for root in "$BOOST_ARCH_PATH" /usr
-a -r "$BOOST_ARCH_PATH/lib/libboost_system.so" ] do
if [ -d "$root/include/boost" \
-a -r "$root/lib$WM_COMPILER_LIB_ARCH/libboost_system.so" ]
then then
echo " BOOST headers in $BOOST_ARCH_PATH/include" echo " BOOST headers in $root/include"
echo " BOOST libs in $BOOST_ARCH_PATH/lib" echo " BOOST libs in $root/lib$WM_COMPILER_LIB_ARCH"
elif [ -d "/usr/include/boost" \ break
-a -r "/usr/lib${WM_COMPILER_LIB_ARCH}/libboost_system.so" ]
then
echo " BOOST headers in /usr/include"
echo " BOOST libs in /usr/lib${WM_COMPILER_LIB_ARCH}"
fi fi
done
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"
elif [ -n "$CGAL_ARCH_PATH" ] elif [ -n "$CGAL_ARCH_PATH" ]
then then
./makeCGAL || warnBuildIssues CGAL ./makeCGAL || warnBuildIssues CGAL