removed perf_gpu_cpu from CMake scripts

diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
index 543f997..018a467 100644 (file)
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -509,8 +509,6 @@ 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()

diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt
index e24b73a..5d2c440 100644 (file)
--- a/modules/gpu/CMakeLists.txt
+++ b/modules/gpu/CMakeLists.txt
@@ -111,43 +111,3 @@ ocv_add_accuracy_tests(FILES "Include" ${test_hdrs}
                        FILES "Src" ${test_srcs}
                        ${nvidia})
 ocv_add_perf_tests()
-
-
-
-set(perf_cpu_path "${CMAKE_CURRENT_SOURCE_DIR}/perf_cpu")
-if(BUILD_PERF_TESTS AND EXISTS "${perf_cpu_path}")
-    # opencv_highgui is required for imread/imwrite
-    set(perf_deps ${the_module} opencv_ts opencv_highgui opencv_imgproc opencv_calib3d opencv_objdetect opencv_video opencv_nonfree)
-    ocv_check_dependencies(${perf_deps})
-
-    if(OCV_DEPENDENCIES_FOUND)
-      set(the_target "opencv_perf_gpu_cpu")
-
-      ocv_module_include_directories(${perf_deps} "${perf_cpu_path}")
-
-      if(NOT OPENCV_PERF_${the_module}_CPU_SOURCES)
-        file(GLOB perf_srcs "${perf_cpu_path}/*.cpp")
-        file(GLOB perf_hdrs "${perf_cpu_path}/*.hpp" "${perf_cpu_path}/*.h")
-        source_group("Src" FILES ${perf_srcs})
-        source_group("Include" FILES ${perf_hdrs})
-        set(OPENCV_PERF_${the_module}_CPU_SOURCES ${perf_srcs} ${perf_hdrs})
-      endif()
-
-      add_executable(${the_target} ${OPENCV_PERF_${the_module}_CPU_SOURCES})
-      target_link_libraries(${the_target} ${OPENCV_MODULE_${the_module}_DEPS} ${perf_deps} ${OPENCV_LINKER_LIBS})
-
-      # Additional target properties
-      set_target_properties(${the_target} PROPERTIES
-        DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
-        RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}"
-      )
-
-      if(ENABLE_SOLUTION_FOLDERS)
-        set_target_properties(${the_target} PROPERTIES FOLDER "tests performance")
-      endif()
-
-      ocv_add_precompiled_headers(${the_target})
-    else(OCV_DEPENDENCIES_FOUND)
-      #TODO: warn about unsatisfied dependencies
-    endif(OCV_DEPENDENCIES_FOUND)
-  endif()

diff --git a/modules/gpu/perf/perf_precomp.hpp b/modules/gpu/perf/perf_precomp.hpp
index be3f234..8378599 100644 (file)
--- a/modules/gpu/perf/perf_precomp.hpp
+++ b/modules/gpu/perf/perf_precomp.hpp
@@ -27,7 +27,7 @@
 #include "opencv2/nonfree/nonfree.hpp"\r
 #include "opencv2/legacy/legacy.hpp"\r
 \r
-#include "perf_utility.hpp"\r
+#include "utility.hpp"\r
 \r
 #ifdef GTEST_CREATE_SHARED_LIBRARY\r
 #error no modules except ts should have GTEST_CREATE_SHARED_LIBRARY defined\r

diff --git a/modules/gpu/perf/perf_utility.cpp b/modules/gpu/perf/utility.cpp
similarity index 100%
rename from modules/gpu/perf/perf_utility.cpp
rename to modules/gpu/perf/utility.cpp

diff --git a/modules/gpu/perf/perf_utility.hpp b/modules/gpu/perf/utility.hpp
similarity index 100%
rename from modules/gpu/perf/perf_utility.hpp
rename to modules/gpu/perf/utility.hpp

diff --git a/modules/gpu/test/precomp.cpp b/modules/gpu/test/test_precomp.cpp
similarity index 100%
rename from modules/gpu/test/precomp.cpp
rename to modules/gpu/test/test_precomp.cpp

diff --git a/modules/gpu/test/precomp.hpp b/modules/gpu/test/test_precomp.hpp
similarity index 100%
rename from modules/gpu/test/precomp.hpp
rename to modules/gpu/test/test_precomp.hpp