Merged the trunk r8589:8653 - all changes related to build warnings

cmake/OpenCVModule.cmake

@@ -131,7 +131,7 @@ macro(ocv_add_module _name)
         set(OPENCV_MODULES_PUBLIC ${OPENCV_MODULES_PUBLIC} "${the_module}" CACHE INTERNAL "List of OpenCV modules marked for export")
       endif()
     endif()
-    
+
     # add self to the world dependencies
     if(NOT DEFINED OPENCV_MODULE_IS_PART_OF_WORLD AND NOT OPENCV_MODULE_${the_module}_CLASS STREQUAL "BINDINGS" OR OPENCV_MODULE_IS_PART_OF_WORLD)
       ocv_add_dependencies(opencv_world OPTIONAL ${the_module})
@@ -512,6 +512,8 @@ endmacro()
 macro(ocv_add_precompiled_headers the_target)
     if("${the_target}" MATCHES "^opencv_test_.*$")
         SET(pch_path "test/test_")
+  elseif("${the_target}" MATCHES "opencv_perf_gpu_cpu")
+      SET(pch_path "perf_cpu/perf_cpu_")
     elseif("${the_target}" MATCHES "^opencv_perf_.*$")
         SET(pch_path "perf/perf_")
     else()