Commit 18ff56a2 authored by T.J. Corona's avatar T.J. Corona Committed by Kitware Robot

Merge topic 'update-common-sb'

507f20a4 Do not enable opencv by default
cb22385a Fix inputs to superbuild functions
b451c303 Update common superbuild
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !452
parents 840de072 507f20a4
......@@ -10,7 +10,7 @@ if (numpy_built_by_superbuild)
endif ()
superbuild_add_project(opencv
DEFAULT_ON
# DEFAULT_ON
DEPENDS python numpy
CMAKE_ARGS
-DBUILD_PERF_TESTS:BOOL=OFF
......
......@@ -57,7 +57,8 @@ foreach (executable IN LISTS paraview_executables cmb_programs_to_install)
endif ()
superbuild_windows_install_program("${executable}"
"${library_paths}")
"bin"
SEARCH_DIRECTORIES "${library_paths}")
list(APPEND plugins
${cmb_plugins_${executable}})
endforeach ()
......@@ -129,8 +130,9 @@ foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
superbuild_windows_install_plugin(
"${qt5_plugin_path}"
"bin"
"bin/${qt5_plugin_group}"
"${library_paths}")
SEARCH_DIRECTORIES "${library_paths}")
endforeach ()
if (qt5_enabled)
......@@ -138,6 +140,7 @@ if (qt5_enabled)
superbuild_windows_install_plugin(
"${Qt5_DIR}/../../../bin/${qt5_opengl_lib}.dll"
"bin"
"${library_paths}")
"bin"
SEARCH_DIRECTORIES "${library_paths}")
endforeach ()
endif ()
Subproject commit 14a0ace305b6736031ac605331ce885586150e36
Subproject commit d0d4e6e509f39203e299e8739a5e061707de00d8
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