Commit d4c1dd35 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

paraview: fix bundling the new install tree layout

Libraries and plugins are now in the Unix locations. Also suppress use
of `@rpath/` in library names just like other projects.
parent 25d50181
......@@ -2,7 +2,7 @@ include(paraview-appname)
set(paraview_doc_dir "${paraview_appname}/Contents/doc")
set(paraview_data_dir "${paraview_appname}/Contents/examples")
set(paraview_materials_dir "${paraview_appname}/Contents/materials")
set(paraview_plugin_path "Applications/paraview.app/Contents/Plugins")
set(paraview_plugin_path "lib/paraview-${paraview_version}/plugins")
include(paraview.bundle.common)
if (NOT paraview_has_gui)
......@@ -68,7 +68,7 @@ foreach (executable IN LISTS paraview_executables)
superbuild_apple_install_utility(
"\${CMAKE_INSTALL_PREFIX}"
"${paraview_appname}"
"${superbuild_install_location}/Applications/paraview.app/Contents/bin/${executable}"
"${superbuild_install_location}/bin/${executable}"
SEARCH_DIRECTORIES "${superbuild_install_location}/lib"
INCLUDE_REGEXES ${include_regexes})
endforeach ()
......
......@@ -147,6 +147,7 @@ superbuild_add_project(paraview
-DPARAVIEW_BUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DPARAVIEW_BUILD_TESTING:BOOL=OFF
-DCMAKE_INSTALL_LIBDIR:PATH=lib
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
-DPARAVIEW_PLUGIN_ENABLE_OpenVR:BOOL=${openvr_enabled}
-DPARAVIEW_BUILD_QT_GUI:BOOL=${qt5_enabled}
-DPARAVIEW_ENABLE_FFMPEG:BOOL=${ffmpeg_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