Commit 3b465700 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'opencv-libdirs'

e440004d opencv: install where it wants and fix it in packaging
Acked-by: Kitware Robot's avatarKitware Robot <>
Merge-request: !186
parents 7becc637 e440004d
......@@ -12,5 +12,4 @@ superbuild_add_project(opencv
......@@ -20,6 +20,25 @@ if (USE_SYSTEM_qt4)
endif ()
if (opencv_enabled)
if (MSVC12)
set(msvc_ver vc12)
elseif (MSVC14)
set(msvc_ver vc14)
else ()
message(FATAL_ERROR "Unrecognized MSVC version")
endif ()
if (superbuild_is_64bit)
set(msvc_arch x64)
else ()
set(msvc_arch x86)
endif ()
list(APPEND library_paths
endif ()
foreach (executable IN LISTS paraview_executables cmb_programs_to_install)
if (DEFINED "${executable}_description")
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