diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt index bc1f9ada85..2e97b88663 100644 --- a/modules/dnn/CMakeLists.txt +++ b/modules/dnn/CMakeLists.txt @@ -148,16 +148,20 @@ ocv_add_perf_tests(${INF_ENGINE_TARGET} FILES Include ${perf_hdrs} ) -ocv_option(${the_module}_PERF_CAFFE "Add performance tests of Caffe framework" OFF) -ocv_option(${the_module}_PERF_CLCAFFE "Add performance tests of clCaffe framework" OFF) +ocv_option(OPENCV_DNN_PERF_CAFFE "Add performance tests of Caffe framework" OFF) +ocv_option(OPENCV_DNN_PERF_CLCAFFE "Add performance tests of clCaffe framework" OFF) if(BUILD_PERF_TESTS) - if (${the_module}_PERF_CAFFE) + if (OPENCV_DNN_PERF_CAFFE + OR ${the_module}_PERF_CAFFE # compatibility for deprecated option + ) find_package(Caffe QUIET) if (Caffe_FOUND) add_definitions(-DHAVE_CAFFE=1) ocv_target_link_libraries(opencv_perf_dnn caffe) endif() - elseif(${the_module}_PERF_CLCAFFE) + elseif(OPENCV_DNN_PERF_CLCAFFE + OR ${the_module}_PERF_CAFFE # compatibility for deprecated option + ) find_package(Caffe QUIET) if (Caffe_FOUND) add_definitions(-DHAVE_CLCAFFE=1)