Commit ae350ee9 authored by Ben Boeckel's avatar Ben Boeckel

unix: use the new installation macros

parent 437f7cee
set(library_paths
"paraview-${paraview_version}"
"cmb-${cmb_version}")
"${superbuild_install_location}/lib"
"${superbuild_install_location}/lib/paraview-${paraview_version}"
"${superbuild_install_location}/lib/cmb-${cmb_version}")
if (QT_LIBRARY_DIR)
list(APPEND library_paths
......@@ -9,8 +10,9 @@ endif ()
set(plugins)
foreach (executable IN LISTS paraview_executables cmb_programs_to_install)
superbuild_unix_install_program("${executable}"
"${library_paths}")
superbuild_unix_install_program_fwd("${executable}"
"lib/paraview-${paraview_version};lib/cmb-${cmb_version}"
SEARCH_DIRECTORIES "${library_paths}")
list(APPEND plugins
${cmb_plugins_${executable}})
endforeach ()
......@@ -19,54 +21,40 @@ list(REMOVE_DUPLICATES plugins)
foreach (plugin IN LISTS plugins)
superbuild_unix_install_plugin("lib${plugin}.so"
"cmb-${cmb_version}"
";${library_paths}"
"cmb-${cmb_version}/plugins/")
"lib/cmb-${cmb_version}"
"lib;lib/cmb-${cmb_version}"
SEARCH_DIRECTORIES "${library_paths}"
LOCATION "lib/cmb-${cmb_version}/plugins/${plugin}/")
endforeach ()
superbuild_unix_install_python(
"${CMAKE_INSTALL_PREFIX}"
"cmb-${cmb_version}"
LIBDIR "lib/cmb-${cmb_version}"
MODULES ${cmb_python_modules}
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
MODULE_DIRECTORIES "${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES
${library_paths})
SEARCH_DIRECTORIES "${library_paths}")
superbuild_unix_install_python(
"${CMAKE_INSTALL_PREFIX}"
"cmb-${cmb_version}"
MODULE_DESTINATION "/site-packages/paraview"
LIBDIR "lib/cmb-${cmb_version}"
MODULES vtk
NAMESPACE paraview
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES
"paraview-${paraview_version}")
MODULE_DIRECTORIES "${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES "${library_paths}")
if (cmb_install_paraview_python)
superbuild_unix_install_python(
"${CMAKE_INSTALL_PREFIX}"
"paraview-${paraview_version}"
MODULES paraview
vtk
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
LIBDIR "lib/paraview-${paraview_version}"
MODULES paraview vtk
MODULE_DIRECTORIES "${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES
"paraview-${paraview_version}")
SEARCH_DIRECTORIES "${library_paths}")
superbuild_unix_install_python(
"${CMAKE_INSTALL_PREFIX}"
"paraview-${paraview_version}"
MODULE_DESTINATION "/site-packages/paraview"
LIBDIR "lib/paraview-${paraview_version}"
MODULES vtk
NAMESPACE paraview
MODULE_DIRECTORIES
"${superbuild_install_location}/lib/python2.7/site-packages"
"${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES
"paraview-${paraview_version}")
MODULE_DIRECTORIES "${superbuild_install_location}/lib/paraview-${paraview_version}/site-packages"
SEARCH_DIRECTORIES "${library_paths}")
endif ()
if (pythonrequests_enabled)
......
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