Commit 39167b38 authored by John Tourtellott's avatar John Tourtellott

Fixes location for standalone plugins

* Installs to "lib/plugins", because it is the default folder
* Uses "lib/" for dependencies, because lib/cmb-6.0 not in runtime path
* Also checks that standalone plugins are enabled before bundling
* And removes TemplateEditor from the bundle
parent c6ac1863
......@@ -106,10 +106,13 @@ set(cmb_plugins_cmb
cmbPostProcessingModePlugin
)
set(cmb_plugins_standalone
smtkProjectManagerPlugin
smtkReadWriteResourceManagerStatePlugin
)
set(cmb_plugins_standalone)
if (smtkprojectmanager_enabled)
list(APPEND cmb_plugins_standalone smtkProjectManagerPlugin)
endif()
if (smtkresourcemanagerstate_enabled)
list(APPEND cmb_plugins_standalone smtkReadWriteResourceManagerStatePlugin)
endif()
if (cumulus_enabled)
set(cmb_plugins_paraview
......
......@@ -5,7 +5,7 @@ set(cmb_package_name "modelbuilder")
set(cmb_programs_to_install
modelbuilder
TemplateEditor)
)
set(cmb_install_paraview_server FALSE)
set(cmb_install_paraview_python TRUE)
......
......@@ -39,10 +39,10 @@ endif()
foreach (plugin IN LISTS plugins)
superbuild_unix_install_plugin("lib${plugin}.so"
"lib/cmb-${cmb_version}"
"lib"
"lib;lib/cmb-${cmb_version}"
SEARCH_DIRECTORIES "${library_paths}"
LOCATION "lib/cmb-${cmb_version}/plugins/${plugin}/"
LOCATION "lib/plugins"
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes})
endforeach ()
......
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