Commit 11a726ce authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #9057 from alalek:static_build_workaround

parents c3586b85 c5a68468
...@@ -4,6 +4,26 @@ endif() ...@@ -4,6 +4,26 @@ endif()
set(the_description "Viz") set(the_description "Viz")
include(${VTK_USE_FILE}) include(${VTK_USE_FILE})
if(NOT BUILD_SHARED_LIBS)
# We observed conflict between builtin 3rdparty libraries and
# system-wide similar libraries (but with different versions) from VTK dependencies
set(_conflicts "")
foreach(dep ${VTK_LIBRARIES})
if(("${dep}" MATCHES "libz\\." AND BUILD_ZLIB)
OR ("${dep}" MATCHES "libjpeg\\." AND BUILD_JPEG)
OR ("${dep}" MATCHES "libpng\\." AND BUILD_PNG)
OR ("${dep}" MATCHES "libtiff\\." AND BUILD_TIFF)
)
list(APPEND _conflicts "${dep}")
endif()
endforeach()
if(_conflicts)
message(STATUS "Disabling VIZ module due conflicts with VTK dependencies: ${_conflicts}")
ocv_module_disable(viz)
endif()
endif()
ocv_define_module(viz opencv_core WRAP python) ocv_define_module(viz opencv_core WRAP python)
ocv_target_link_libraries(${the_module} ${VTK_LIBRARIES}) ocv_target_link_libraries(${the_module} ${VTK_LIBRARIES})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment