Warning fixes continued

cmake/OpenCVCompilerOptions.cmake

@@ -75,7 +75,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   #add_extra_compiler_option(-Wcast-align)
   #add_extra_compiler_option(-Wstrict-aliasing=2)
   #add_extra_compiler_option(-Wshadow)
-  add_extra_compiler_option(-Wno-unnamed-type-template-args)
+  #add_extra_compiler_option(-Wno-unnamed-type-template-args)
 
   # The -Wno-long-long is required in 64bit systems when including sytem headers.
   if(X86_64)

cmake/OpenCVDetectTBB.cmake

@@ -10,7 +10,7 @@ elseif(UNIX AND NOT APPLE)
   if(TBB_FOUND)
     set(HAVE_TBB 1)
     if(NOT ${TBB_INCLUDE_DIRS} STREQUAL "")
-      include_directories(SYSTEM ${TBB_INCLUDE_DIRS})
+      ocv_include_directories(${TBB_INCLUDE_DIRS})
     endif()
     link_directories(${TBB_LIBRARY_DIRS})
     set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${TBB_LIBRARIES})
@@ -63,7 +63,7 @@ if(NOT HAVE_TBB)
 
     set(HAVE_TBB 1)
     if(NOT "${TBB_INCLUDE_DIRS}" STREQUAL "")
-      include_directories(SYSTEM "${TBB_INCLUDE_DIRS}")
+      ocv_include_directories("${TBB_INCLUDE_DIRS}")
     endif()
   endif(TBB_INCLUDE_DIRS)
 endif(NOT HAVE_TBB)

cmake/OpenCVUtils.cmake

@@ -19,7 +19,7 @@ function(ocv_include_directories)
     if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}")
       list(APPEND __add_before "${dir}")
     else()
-      include_directories(AFTER "${dir}")
+      include_directories(AFTER SYSTEM "${dir}")
     endif()
   endforeach()
   include_directories(BEFORE ${__add_before})