Commit 7374e89e authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'external-qt'

31762255 windows: remove cmb_package reference
36d49caf unix: support an external qt
cf6c6561 unix: refactor library paths
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !162
parents 8d05cf2d 31762255
set(library_paths
"paraview-${paraview_version}"
"cmb-${cmb_version}")
if (QT_LIBRARY_DIR)
list(APPEND library_paths
"${QT_LIBRARY_DIR}")
endif ()
set(plugins)
foreach (executable IN LISTS paraview_executables cmb_programs_to_install)
superbuild_unix_install_program("${executable}"
"paraview-${paraview_version};cmb-${cmb_version}")
"${library_paths}")
list(APPEND plugins
${cmb_plugins_${executable}})
endforeach ()
......@@ -11,7 +20,7 @@ list(REMOVE_DUPLICATES plugins)
foreach (plugin IN LISTS plugins)
superbuild_unix_install_plugin("lib${plugin}.so"
"cmb-${cmb_version}"
";paraview-${paraview_version};cmb-${cmb_version}"
";${library_paths}"
"cmb-${cmb_version}/plugins/")
endforeach ()
......@@ -36,8 +45,7 @@ superbuild_unix_install_python(
"${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES
"cmb-${cmb_version}"
"paraview-${paraview_version}")
${library_paths})
superbuild_unix_install_python(
"${CMAKE_INSTALL_PREFIX}"
......
......@@ -83,7 +83,7 @@ superbuild_install_superbuild_python()
if (pythonrequests_enabled)
install(
FILES "${superbuild_install_location}/bin/Lib/site-packages/requests/cacert.pem"
DESTINATION "${cmb_package}/bin/Lib/site-packages/requests"
DESTINATION "bin/Lib/site-packages/requests"
COMPONENT superbuild)
endif ()
......
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