From 85d60f68831d029f108982a45c3d0d2b9f2a5bee Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 30 Jan 2014 09:05:10 +0000
Subject: [PATCH] BUG: etc: CGAL setup
---
etc/config/CGAL.csh | 4 ++++
etc/config/CGAL.sh | 5 +++++
etc/config/settings.csh | 2 +-
etc/config/settings.sh | 3 ++-
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/etc/config/CGAL.csh b/etc/config/CGAL.csh
index 2e3f81f0e4e..5f7dceecc26 100644
--- a/etc/config/CGAL.csh
+++ b/etc/config/CGAL.csh
@@ -41,6 +41,10 @@ if ($?FOAM_VERBOSE && $?prompt) then
echo " $boost_version at $BOOST_ARCH_PATH"
endif
+if ( -d "$CGAL_ARCH_PATH" ) then
+ _foamAddLib $CGAL_ARCH_PATH/lib
+endif
+
if ( -d "$BOOST_ARCH_PATH" ) then
_foamAddLib $BOOST_ARCH_PATH/lib
endif
diff --git a/etc/config/CGAL.sh b/etc/config/CGAL.sh
index cc67908f10b..dc8772dd16a 100644
--- a/etc/config/CGAL.sh
+++ b/etc/config/CGAL.sh
@@ -42,6 +42,11 @@ then
echo " $boost_version at $BOOST_ARCH_PATH"
fi
+if [ -d "$CGAL_ARCH_PATH" ]
+then
+ _foamAddLib $CGAL_ARCH_PATH/lib
+fi
+
if [ -d "$BOOST_ARCH_PATH" ]
then
_foamAddLib $BOOST_ARCH_PATH/lib
diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index a3160377106..244e52fdcfe 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -562,7 +562,7 @@ endif
# cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~
-unalias _foamAddPath _foamAddLib _foamAddMan
+#- keep _foamAddPath _foamAddLib _foamAddMan
unset foamCompiler minBufferSize
# ----------------------------------------------------------------- end-of-file
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 487c550d24f..4fa9120ec13 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -569,6 +569,7 @@ export MPI_BUFFER_SIZE
# cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~
-unset _foamAddPath _foamAddLib _foamAddMan foamCompiler minBufferSize
+#keep _foamAddPath _foamAddLib _foamAddMan
+unset foamCompiler minBufferSize
# ----------------------------------------------------------------- end-of-file
--
GitLab