Merged
Conversation
alalek
reviewed
May 14, 2021
modules/world/CMakeLists.txt
Outdated
| #message(STATUS "${OPENCV_MODULE_${the_module}_SOURCES}") | ||
| ocv_create_module(${link_deps}) | ||
|
|
||
| if(VTK_VERSION VERSION_GREATER_EQUAL "8.90.0") |
Member
There was a problem hiding this comment.
What is about using of this check instead: COMMAND vtk_module_autoinit ?
We also need checks for:
- enabled viz module itself:
"opencv_viz" IN OPENCV_MODULES_BUILD - and viz is part of "opencv_world"
OPENCV_MODULE_opencv_viz_IS_PART_OF_WORLD
Can we move that into "viz/CMakeLists.txt" ?
Member
Author
There was a problem hiding this comment.
These are valid points, I'm going to fix it tomorrow. As for moving vtk_module_autoinit(TARGETS opencv_world MODULES ${VTK_LIBRARIES}) in viz/CMakeLists.txt - I don't believe its possible because it requires opencv_world target to exist.
Member
Author
There was a problem hiding this comment.
I decided to leave VTK_VERSION be in order to be consistent with cmake/OpenCVDetectVTK.cmake. If opencv_viz is a part of world(I added this check), doesnt that mean it is already in OPENCV_MODULES_BUILD?
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
One of two PRs to fix #19386
The second one is opencv/opencv_contrib#2951