Skip to content
Snippets Groups Projects
Commit 9add625c authored by mattijs's avatar mattijs
Browse files

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

parents 4e827d2f 2bc3004a
No related merge requests found
...@@ -339,7 +339,7 @@ endif ...@@ -339,7 +339,7 @@ endif
# ~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~
set boost_version=boost_1_45_0 set boost_version=boost_1_45_0
set cgal_version=CGAL-3.8 set cgal_version=CGAL-3.9
setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
......
...@@ -367,7 +367,7 @@ fi ...@@ -367,7 +367,7 @@ fi
# ~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~
boost_version=boost_1_45_0 boost_version=boost_1_45_0
cgal_version=CGAL-3.8 cgal_version=CGAL-3.9
export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
......
...@@ -7,6 +7,6 @@ cd ${0%/*} || exit 1 # run from this directory ...@@ -7,6 +7,6 @@ cd ${0%/*} || exit 1 # run from this directory
cleanCase cleanCase
\rm -rf 0 \rm -rf 0
\rm -r constant/extendedFeatureEdgeMesh/ \rm -rf constant/extendedFeatureEdgeMesh/
\rm -f constant/triSurface/*.eMesh* \rm -f constant/triSurface/*.eMesh*
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment