mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-23 18:50:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: fix WITH_VTK usage

Browse Source 
'WITH_' variables is intended to enable CMake scripts with some autodetection logic.
'WITH_' can be off, but components is really enabled via command-line options
with proper variables setup (including 'HAVE_').
This commit is contained in:
Alexander Alekhin 2017-11-29 16:52:42 +03:00 committed by Alexander Alekhin
parent b19f81b35b
commit 22c0bb7dc9
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -656,7 +656,9 @@ if(WITH_MATLAB)
include(cmake/OpenCVFindMatlab.cmake)
endif()
include(cmake/OpenCVDetectVTK.cmake)
if(WITH_VTK)
include(cmake/OpenCVDetectVTK.cmake)
endif()
if(WITH_OPENVX)
include(cmake/FindOpenVX.cmake)

4
cmake/OpenCVDetectVTK.cmake
View File

@ -1,7 +1,3 @@
if(NOT WITH_VTK)
return()
endif()
# VTK 6.x components
find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
IF(VTK_FOUND)

2
modules/viz/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if(NOT WITH_VTK OR NOT DEFINED HAVE_VTK OR NOT HAVE_VTK)
if(NOT HAVE_VTK)
ocv_module_disable(viz)
endif()