Commit 70f8a9da authored by John Tourtellott's avatar John Tourtellott Committed by Kitware Robot

Merge topic 'smtk-plugins-var' into release

425e9739 Finish converting SMTK_PLUGINS from cached var to global property
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona's avatarT.J. Corona <tj.corona@kitware.com>
Merge-request: !1460
parents 5007e7ef 425e9739
Pipeline #129008 running with stage
......@@ -6,8 +6,9 @@
#
#=========================================================================
# An internal cache variable for aggregating smtk plugin targets
set(SMTK_PLUGINS "" CACHE INTERNAL "")
define_property(GLOBAL PROPERTY SMTK_PLUGINS
BRIEF_DOCS "Global property for aggregating smtk plugin targets"
FULL_DOCS "Global property for aggregating smtk plugin targets")
# create a plugin
# REGISTRAR is used to register the plugin
......@@ -35,11 +36,7 @@ function(add_smtk_plugin SMTK_PLUGIN_NAME SMTK_PLUGIN_VERSION)
"${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}
)
if (SMTK_PLUGINS)
set(SMTK_PLUGINS "${SMTK_PLUGINS};${SMTK_PLUGIN_NAME}" CACHE INTERNAL "")
else ()
set(SMTK_PLUGINS "${SMTK_PLUGIN_NAME}" CACHE INTERNAL "")
endif ()
set_property(GLOBAL APPEND PROPERTY SMTK_PLUGINS "${SMTK_PLUGIN_NAME}")
string(REPLACE ";" "," SMTK_PLUGIN_MANAGERS_CS "${SMTK_PLUGIN_MANAGERS}")
......
......@@ -141,7 +141,7 @@ if(SMTK_ENABLE_PARAVIEW_SUPPORT)
${PLUGIN_PROXY_IFACE_SRCS}
${PLUGIN_DOCK_IFACES_SRCS}
)
set(SMTK_PLUGINS "${SMTK_PLUGINS};smtkPQCumulusJobsPlugin" CACHE INTERNAL "")
set_property(GLOBAL APPEND PROPERTY SMTK_PLUGINS "smtkPQCumulusJobsPlugin")
target_link_libraries(smtkPQCumulusJobsPlugin
LINK_PUBLIC
......
......@@ -338,7 +338,7 @@ add_paraview_plugin(
${PLUGIN_PROXY_IFACE_SRCS}
${PLUGIN_DOCK_IFACES_SRCS}
)
set(SMTK_PLUGINS "${SMTK_PLUGINS};smtkPQComponentsPlugin" CACHE INTERNAL "")
set_property(GLOBAL APPEND PROPERTY SMTK_PLUGINS "smtkPQComponentsPlugin")
target_link_libraries(smtkPQComponentsPlugin
LINK_PUBLIC
......
......@@ -85,7 +85,7 @@ add_paraview_plugin(
CS_KITS
vtkSMTKWidgetsExt
)
set(SMTK_PLUGINS "${SMTK_PLUGINS};smtkPQOperationViewsPlugin" CACHE INTERNAL "")
set_property(GLOBAL APPEND PROPERTY SMTK_PLUGINS "smtkPQOperationViewsPlugin")
target_link_libraries(smtkPQOperationViewsPlugin
LINK_PUBLIC
smtkPQOperationViewsExt
......
......@@ -87,7 +87,8 @@ add_paraview_plugin(
SERVER_MANAGER_XML ${serverXMLSrcs}
CS_KITS ${serverModules}
)
set(SMTK_PLUGINS "${SMTK_PLUGINS};smtkPVServerExtPlugin" CACHE INTERNAL "")
set_property(GLOBAL APPEND PROPERTY SMTK_PLUGINS "smtkPVServerExtPlugin")
target_link_libraries(smtkPVServerExtPlugin
LINK_PUBLIC
smtkPVServerExt
......
......@@ -131,7 +131,7 @@ add_paraview_plugin(
CS_KITS
vtkSMTKWidgetsExt
)
set(SMTK_PLUGINS "${SMTK_PLUGINS};smtkPQWidgetsPlugin" CACHE INTERNAL "")
set_property(GLOBAL APPEND PROPERTY SMTK_PLUGINS "smtkPQWidgetsPlugin")
target_link_libraries(smtkPQWidgetsPlugin
LINK_PUBLIC
......
......@@ -7,6 +7,7 @@ include(ParaViewPlugins)
# not be found.
list(APPEND CMAKE_MODULE_PATH "${VTK_MODULES_DIR}")
get_property(SMTK_PLUGINS GLOBAL PROPERTY SMTK_PLUGINS)
foreach(name ${SMTK_PLUGINS})
set(SMTK_PLUGIN_IMPORT_INIT "${SMTK_PLUGIN_IMPORT_INIT}PV_PLUGIN_IMPORT_INIT(${name});\n")
set(SMTK_PLUGIN_IMPORT "${SMTK_PLUGIN_IMPORT}PV_PLUGIN_IMPORT(${name});\n")
......
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