Skip to content

Update CMakeLists.txt#19984

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
sturkmen72:patch-4
Apr 28, 2021
Merged

Update CMakeLists.txt#19984
opencv-pushbot merged 1 commit intoopencv:3.4from
sturkmen72:patch-4

Conversation

@sturkmen72
Copy link
Copy Markdown
Contributor

opencv_dnn_PERF_CAFFE -> OPENCV_DNN_PERF_CAFFE
opencv_dnn_PERF_CLCAFFE -> OPENCV_DNN_PERF_CLCAFFE

these two options appears in a seperated group in cmake GUI when grouped.

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)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please provide compatibility shim for old variables too:

if (OPENCV_DNN_PERF_CAFFE
    OR ${the_module}_PERF_CAFFE  # compatibility for deprecated option
)

Or emit warning about removed variables through ocv_declare_removed_variable / ocv_declare_removed_variables (less compatible, probably should go to the "next" branch only)

@opencv-pushbot opencv-pushbot merged commit fd44ba2 into opencv:3.4 Apr 28, 2021
@sturkmen72 sturkmen72 deleted the patch-4 branch April 28, 2021 23:06
@alalek alalek mentioned this pull request May 1, 2021
@alalek alalek mentioned this pull request Jun 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants