Commit 14596021 authored by T.J. Corona's avatar T.J. Corona

Reenable the superbuild's handling of plugins

parent c0310881
......@@ -9,6 +9,19 @@ foreach(program IN LISTS cmb_programs_to_install)
endforeach()
list(APPEND plugins ${cmb_plugins_cmb})
# Install CMB plugins in modelbuilder app
if (cmb_plugins_smtk)
foreach(plugin IN LISTS cmb_plugins_smtk)
find_library(${plugin}_path "lib${plugin}.dylib" ${superbuild_install_location}/lib)
if (${plugin}_path)
list(APPEND plugin_paths ${${plugin}_path})
else()
message(WARNING "Could not locate ${plugin}")
endif()
endforeach()
list(APPEND plugins ${cmb_plugins_smtk})
endif()
# Install CMB plugins in modelbuilder app
foreach(plugin IN LISTS cmb_plugins_standalone)
find_library(plugin_path "lib${plugin}.dylib" ${superbuild_install_location}/lib)
......
......@@ -72,7 +72,7 @@ endif ()
# application is currently less fault-prone than ParaView's default plugin
# system. Future updates to ParaView may obviate the need for this ability,
# however. Until then, we disable the following logic for SMTK's plugins.
set(LINK_TO_PLUGINS True)
set(LINK_TO_PLUGINS False)
if (NOT ${LINK_TO_PLUGINS})
set(cmb_plugins_smtk
smtkAttributePlugin
......@@ -81,7 +81,6 @@ if (NOT ${LINK_TO_PLUGINS})
smtkMeshPlugin
smtkMeshSessionPlugin
smtkModelPlugin
smtkOpenCVPlugin
smtkOperationPlugin
smtkPQComponentsPlugin
smtkPQOperationViewsPlugin
......@@ -96,6 +95,11 @@ if (NOT ${LINK_TO_PLUGINS})
smtkMatplotlibPlugin)
endif ()
if (opencv_enabled)
list(APPEND cmb_plugins_smtk
smtkOpenCVPlugin)
endif ()
if (vxl_enabled)
list(APPEND cmb_plugins_smtk
smtkVXLOperationViewsPlugin)
......
......@@ -58,6 +58,19 @@ foreach (plugin IN LISTS cmb_plugins_cmb)
)
endforeach ()
if (cmb_plugins_smtk)
foreach (plugin IN LISTS cmb_plugins_smtk)
superbuild_unix_install_plugin("lib${plugin}.so"
"lib"
"lib/${plugin}"
SEARCH_DIRECTORIES "${library_paths}"
LOCATION "lib/plugins"
INCLUDE_REGEXES ${include_regexes}
EXCLUDE_REGEXES ${exclude_regexes}
)
endforeach ()
endif()
foreach (plugin IN LISTS cmb_plugins_standalone)
superbuild_unix_install_plugin("lib${plugin}.so"
"lib"
......
......@@ -81,6 +81,16 @@ foreach (plugin IN LISTS cmb_plugins_cmb)
"${plugin_library_paths}")
endforeach ()
if (cmb_plugins_smtk)
foreach (plugin IN LISTS cmb_plugins_smtk)
set(plugin_library_paths ${library_paths})
list(APPEND plugin_library_paths "bin/${plugin}")
superbuild_windows_install_plugin("${plugin}.dll"
"bin"
"${plugin_library_paths}")
endforeach ()
endif()
foreach (plugin IN LISTS cmb_plugins_standalone)
set(plugin_library_paths ${library_paths})
list(APPEND plugin_library_paths "bin/${plugin}")
......
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