Commit e440004d authored by Ben Boeckel's avatar Ben Boeckel

opencv: install where it wants and fix it in packaging

parent 0f0deed7
...@@ -12,5 +12,4 @@ superbuild_add_project(opencv ...@@ -12,5 +12,4 @@ superbuild_add_project(opencv
-DWITH_GTK:BOOL=OFF -DWITH_GTK:BOOL=OFF
-DWITH_FFMPEG:BOOL=OFF -DWITH_FFMPEG:BOOL=OFF
-DWITH_VTK:BOOL=OFF -DWITH_VTK:BOOL=OFF
-DOpenCV_INSTALL_BINARIES_PREFIX:STRING=
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib) -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib)
...@@ -20,6 +20,25 @@ if (USE_SYSTEM_qt4) ...@@ -20,6 +20,25 @@ if (USE_SYSTEM_qt4)
"${QT_LIBRARY_DIR}") "${QT_LIBRARY_DIR}")
endif () 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
"${superbuild_install_directory}/${msvc_arch}/${msvc_ver}/bin")
endif ()
set(plugins) set(plugins)
foreach (executable IN LISTS paraview_executables cmb_programs_to_install) foreach (executable IN LISTS paraview_executables cmb_programs_to_install)
if (DEFINED "${executable}_description") 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