From 98f97e7852b7106a6a1cac9a1cd7667d9eebe0b1 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Fri, 7 Jan 2011 14:24:17 +0000
Subject: [PATCH] COMP: CGAL 3.7 now used.  Template depth required to
 increased > 75, made 100.

---
 etc/settings.csh               | 2 +-
 etc/settings.sh                | 2 +-
 wmake/rules/SiCortex64Gcc/c++  | 2 +-
 wmake/rules/SunOS64Gcc/c++     | 2 +-
 wmake/rules/linux64Clang/c++   | 2 +-
 wmake/rules/linux64Gcc++0x/c++ | 2 +-
 wmake/rules/linux64Gcc/c++     | 2 +-
 wmake/rules/linux64Gcc43/c++   | 2 +-
 wmake/rules/linux64Gcc44/c++   | 2 +-
 wmake/rules/linux64Gcc45/c++   | 2 +-
 wmake/rules/linuxClang/c++     | 2 +-
 wmake/rules/linuxGcc/c++       | 2 +-
 wmake/rules/linuxGcc43/c++     | 2 +-
 wmake/rules/linuxGcc44/c++     | 2 +-
 wmake/rules/linuxGcc45/c++     | 2 +-
 wmake/rules/linuxIA64Gcc/c++   | 2 +-
 wmake/rules/linuxPPC64Gcc/c++  | 2 +-
 wmake/rules/linuxmingw32/c++   | 2 +-
 wmake/rules/solarisGcc/c++     | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/etc/settings.csh b/etc/settings.csh
index 139a295870d..530eeb9d8bc 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -230,7 +230,7 @@ endif
 # ~~~~~~~~~~~~~~
 
 set boost_version=boost_1_42_0
-set cgal_version=CGAL-3.5.1
+set cgal_version=CGAL-3.7
 
 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
diff --git a/etc/settings.sh b/etc/settings.sh
index e401860ef26..bf96da3a32b 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -248,7 +248,7 @@ fi
 # ~~~~~~~~~~~~~~
 
 boost_version=boost_1_42_0
-cgal_version=CGAL-3.5.1
+cgal_version=CGAL-3.7
 
 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
diff --git a/wmake/rules/SiCortex64Gcc/c++ b/wmake/rules/SiCortex64Gcc/c++
index 2b4cb4c48ff..f6d7be55483 100644
--- a/wmake/rules/SiCortex64Gcc/c++
+++ b/wmake/rules/SiCortex64Gcc/c++
@@ -7,7 +7,7 @@ CC          = g++ -mabi=64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = -G0 $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/SunOS64Gcc/c++ b/wmake/rules/SunOS64Gcc/c++
index 23454980563..3ca193e296d 100644
--- a/wmake/rules/SunOS64Gcc/c++
+++ b/wmake/rules/SunOS64Gcc/c++
@@ -6,7 +6,7 @@ CC          = g++ -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linux64Clang/c++ b/wmake/rules/linux64Clang/c++
index 75da3e4ad2f..11efc0c69bd 100644
--- a/wmake/rules/linux64Clang/c++
+++ b/wmake/rules/linux64Clang/c++
@@ -6,7 +6,7 @@ CC          = clang++ -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linux64Gcc++0x/c++ b/wmake/rules/linux64Gcc++0x/c++
index 4f858ff338c..ff7cf481fdc 100644
--- a/wmake/rules/linux64Gcc++0x/c++
+++ b/wmake/rules/linux64Gcc++0x/c++
@@ -6,7 +6,7 @@ CC          = g++ -m64 -std=c++0x
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linux64Gcc/c++ b/wmake/rules/linux64Gcc/c++
index 7aab7623129..520e39c3b1a 100644
--- a/wmake/rules/linux64Gcc/c++
+++ b/wmake/rules/linux64Gcc/c++
@@ -6,7 +6,7 @@ CC          = g++ -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linux64Gcc43/c++ b/wmake/rules/linux64Gcc43/c++
index 53455aa74c4..3ca193e296d 100644
--- a/wmake/rules/linux64Gcc43/c++
+++ b/wmake/rules/linux64Gcc43/c++
@@ -6,7 +6,7 @@ CC          = g++ -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-40
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linux64Gcc44/c++ b/wmake/rules/linux64Gcc44/c++
index 23454980563..3ca193e296d 100644
--- a/wmake/rules/linux64Gcc44/c++
+++ b/wmake/rules/linux64Gcc44/c++
@@ -6,7 +6,7 @@ CC          = g++ -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linux64Gcc45/c++ b/wmake/rules/linux64Gcc45/c++
index 23454980563..3ca193e296d 100644
--- a/wmake/rules/linux64Gcc45/c++
+++ b/wmake/rules/linux64Gcc45/c++
@@ -6,7 +6,7 @@ CC          = g++ -m64
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxClang/c++ b/wmake/rules/linuxClang/c++
index 2f7a3bde441..eec5f2c0811 100644
--- a/wmake/rules/linuxClang/c++
+++ b/wmake/rules/linuxClang/c++
@@ -6,7 +6,7 @@ CC          = clang++ -m32
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxGcc/c++ b/wmake/rules/linuxGcc/c++
index 7cbedb1fd63..e862181fc5c 100644
--- a/wmake/rules/linuxGcc/c++
+++ b/wmake/rules/linuxGcc/c++
@@ -6,7 +6,7 @@ CC          = g++ -m32
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxGcc43/c++ b/wmake/rules/linuxGcc43/c++
index 7cbedb1fd63..e862181fc5c 100644
--- a/wmake/rules/linuxGcc43/c++
+++ b/wmake/rules/linuxGcc43/c++
@@ -6,7 +6,7 @@ CC          = g++ -m32
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxGcc44/c++ b/wmake/rules/linuxGcc44/c++
index 7cbedb1fd63..e862181fc5c 100644
--- a/wmake/rules/linuxGcc44/c++
+++ b/wmake/rules/linuxGcc44/c++
@@ -6,7 +6,7 @@ CC          = g++ -m32
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxGcc45/c++ b/wmake/rules/linuxGcc45/c++
index 7cbedb1fd63..e862181fc5c 100644
--- a/wmake/rules/linuxGcc45/c++
+++ b/wmake/rules/linuxGcc45/c++
@@ -6,7 +6,7 @@ CC          = g++ -m32
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxIA64Gcc/c++ b/wmake/rules/linuxIA64Gcc/c++
index dc0992866b5..b258455b2c8 100644
--- a/wmake/rules/linuxIA64Gcc/c++
+++ b/wmake/rules/linuxIA64Gcc/c++
@@ -6,7 +6,7 @@ CC          = g++
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxPPC64Gcc/c++ b/wmake/rules/linuxPPC64Gcc/c++
index 532011e6d6f..b8e735a5bcd 100644
--- a/wmake/rules/linuxPPC64Gcc/c++
+++ b/wmake/rules/linuxPPC64Gcc/c++
@@ -6,7 +6,7 @@ CC          = g++ -m64 -mcpu=power5+
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
diff --git a/wmake/rules/linuxmingw32/c++ b/wmake/rules/linuxmingw32/c++
index a0812a1cbaf..52945c1aa8b 100644
--- a/wmake/rules/linuxmingw32/c++
+++ b/wmake/rules/linuxmingw32/c++
@@ -6,7 +6,7 @@ CC          = mingw32-g++
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS)
 
diff --git a/wmake/rules/solarisGcc/c++ b/wmake/rules/solarisGcc/c++
index 8f71f615718..667b00c8945 100644
--- a/wmake/rules/solarisGcc/c++
+++ b/wmake/rules/solarisGcc/c++
@@ -6,7 +6,7 @@ CC          = g++
 
 include $(RULES)/c++$(WM_COMPILE_OPTION)
 
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
 
 c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
 
-- 
GitLab