Merge topic 'handle_plugins_changes'

b4d12db2 Handle changes to plugin paths in Windows/Unix.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !391

projects/unix/catalyst.bundle.cmake

@@ -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)
 

projects/unix/paraview.bundle.cmake

@@ -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)

projects/unix/paraview.bundle.unix.cmake

@@ -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")
 

projects/win32/paraview.bundle.cmake

 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")