diff --git a/cmake/ACGCompiler.cmake b/cmake/ACGCompiler.cmake
index bdb8ad46..dd70fea8 100644
--- a/cmake/ACGCompiler.cmake
+++ b/cmake/ACGCompiler.cmake
@@ -66,13 +66,15 @@ if (UNIX)
   list(APPEND ADDITIONAL_C_DEBUG_FLAGS            "-DINCLUDE_TEMPLATES" )
   list(APPEND ADDITIONAL_C_RELEASE_FLAGS          "-DINCLUDE_TEMPLATES" )
   list(APPEND ADDITIONAL_C_RELWITHDEBINFO_FLAGS   "-DINCLUDE_TEMPLATES" )
-  
-  # Increase the template depth as this might be exceeded from time to time
-  IF( NOT CMAKE_SYSTEM MATCHES "SunOS*")
-    list(APPEND ADDITIONAL_CXX_DEBUG_FLAGS          "-ftemplate-depth-100" )
-    list(APPEND ADDITIONAL_CXX_RELEASE_FLAGS        "-ftemplate-depth-100" )
-    list(APPEND ADDITIONAL_CXX_RELWITHDEBINFO_FLAGS "-ftemplate-depth-100" )  
-  ENDIF()
+ 
+#  Deprecated setting. Remove in future release, as the default template depth 
+#  should be enough with state of the art compilers 
+#  # Increase the template depth as this might be exceeded from time to time
+#  IF( NOT CMAKE_SYSTEM MATCHES "SunOS*")
+#    list(APPEND ADDITIONAL_CXX_DEBUG_FLAGS          "-ftemplate-depth-100" )
+#    list(APPEND ADDITIONAL_CXX_RELEASE_FLAGS        "-ftemplate-depth-100" )
+#    list(APPEND ADDITIONAL_CXX_RELWITHDEBINFO_FLAGS "-ftemplate-depth-100" )  
+#  ENDIF()
   
   ################################################################################
   # OS Defines