Commit 7b4e96f0 authored by Shawn Waldon's avatar Shawn Waldon Committed by Kitware Robot

Merge topic 'windows-fixup-bundle'

354033be packaging: update windows to new fixup bundle
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !394
parents 91550eaa 354033be
Pipeline #87906 pending with stage
......@@ -35,14 +35,14 @@ foreach (executable IN LISTS paraview_executables)
"bin/${executable}.exe" "${${executable}_description}")
endif ()
superbuild_windows_install_program("${executable}"
superbuild_windows_install_program("${executable}" "bin" SEARCH_DIRECTORIES
"${library_paths}")
endforeach()
foreach (paraview_plugin IN LISTS paraview_plugins)
superbuild_windows_install_plugin("${paraview_plugin}.dll"
"${paraview_plugin_path}/${paraview_plugin}"
"${paraview_plugin_path}/${paraview_plugin};${library_paths}")
"${paraview_plugin_path}/${paraview_plugin}" "bin/plugins/${paraview_plugin}" SEARCH_DIRECTORIES
"${paraview_plugin_path}/${paraview_plugin}" "${library_paths}" "${superbuild_install_location}/bin")
endforeach ()
set(plugins_file "${CMAKE_CURRENT_BINARY_DIR}/paraview.plugins")
......@@ -66,7 +66,8 @@ if (python_enabled)
MODULE_DIRECTORIES "${superbuild_install_location}/bin/Lib/site-packages"
"${superbuild_install_location}/lib/site-packages"
"${superbuild_install_location}/lib/python2.7/site-packages"
SEARCH_DIRECTORIES "lib")
"${superbuild_install_location}/lib/paraview-${paraview_version_major}.${paraview_version_minor}/site-packages"
SEARCH_DIRECTORIES "lib" "${superbuild_install_location}/bin")
if (matplotlib_enabled)
install(
......@@ -82,7 +83,8 @@ if (python_enabled)
"${superbuild_install_location}/bin/Lib/site-packages"
"${superbuild_install_location}/lib/site-packages"
"${superbuild_install_location}/lib/python2.7/site-packages"
SEARCH_DIRECTORIES "lib")
"${superbuild_install_location}/lib/paraview-${paraview_version_major}.${paraview_version_minor}/site-packages"
SEARCH_DIRECTORIES "lib" "${superbuild_install_location}/bin")
endif ()
if (paraviewweb_enabled)
......@@ -102,13 +104,13 @@ if (paraviewweb_enabled)
endif ()
foreach (qt5_plugin_path IN LISTS qt5_plugin_paths)
get_filename_component(qt5_plugin_group "${qt5_plugin_path}" DIRECTORY)
get_filename_component(qt5_plugin_group "${qt5_plugin_group}" NAME)
superbuild_windows_install_plugin(
"${qt5_plugin_path}"
"bin"
"bin/${qt5_plugin_group}"
"${library_paths}")
SEARCH_DIRECTORIES "${library_paths}")
endforeach ()
if (qt5_enabled)
......@@ -116,7 +118,8 @@ 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 340089215dbb42c1c8747ef09431c44a98164d7d
Subproject commit 2f522742ca5178b7677017481f127a1bae7150fa
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