Commit b4d12db2 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Handle changes to plugin paths in Windows/Unix.

Address changes introduced by paraview!2032.
parent 21aca418
......@@ -2,7 +2,7 @@ include(paraview-version)
set(paraview_doc_dir "share/paraview-${paraview_version}/doc")
set(paraview_data_dir "share/paraview-${paraview_version}/data")
set(paraview_plugin_path "lib")
set(paraview_plugin_path "lib/paraview-${paraview_version}/plugins")
set(CPACK_PACKAGE_NAME "ParaView-Catalyst-${PARAVIEW_CATALYST_EDITION}")
include(paraview.bundle.common)
......
......@@ -2,7 +2,7 @@ include(paraview-version)
set(paraview_doc_dir "share/paraview-${paraview_version}/doc")
set(paraview_data_dir "share/paraview-${paraview_version}/data")
set(paraview_plugin_path "lib")
set(paraview_plugin_path "lib/paraview-${paraview_version}/plugins")
include(paraview.bundle.common)
set(paraview_component ParaView)
......
......@@ -32,11 +32,11 @@ endforeach ()
foreach (paraview_plugin IN LISTS paraview_plugins)
superbuild_unix_install_plugin("lib${paraview_plugin}.so"
"lib"
"lib"
"${paraview_plugin_path}/${paraview_plugin}"
LOADER_PATHS "${library_paths}"
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes}
LOCATION "lib/plugins/${paraview_plugin}/")
LOCATION "${paraview_plugin_path}/${paraview_plugin}/")
endforeach ()
set(plugins_file "${CMAKE_CURRENT_BINARY_DIR}/paraview.plugins")
......@@ -44,7 +44,7 @@ paraview_add_plugin("${plugins_file}" ${paraview_plugins})
install(
FILES "${plugins_file}"
DESTINATION "lib"
DESTINATION ${paraview_plugin_path}
COMPONENT superbuild
RENAME ".plugins")
......
set(paraview_doc_dir "doc")
set(paraview_data_dir "data")
set(paraview_plugin_path "bin")
set(paraview_plugin_path "bin/plugins")
include(paraview.bundle.common)
# Set NSIS install specific stuff.
......@@ -41,8 +41,8 @@ endforeach()
foreach (paraview_plugin IN LISTS paraview_plugins)
superbuild_windows_install_plugin("${paraview_plugin}.dll"
"bin"
"${library_paths}")
"${paraview_plugin_path}/${paraview_plugin}"
"${paraview_plugin_path}/${paraview_plugin};${library_paths}")
endforeach ()
set(plugins_file "${CMAKE_CURRENT_BINARY_DIR}/paraview.plugins")
......@@ -50,7 +50,7 @@ paraview_add_plugin("${plugins_file}" ${paraview_plugins})
install(
FILES "${plugins_file}"
DESTINATION "bin"
DESTINATION "${paraview_plugin_path}"
COMPONENT superbuild
RENAME ".plugins")
......
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