Merge topic 'smtk-plugins-var' into release

425e9739 Finish converting SMTK_PLUGINS from cached var to global property
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona <tj.corona@kitware.com>
Merge-request: !1460

CMake/SMTKPluginMacros.cmake

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

smtk/extension/cumulus/CMakeLists.txt

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

smtk/extension/paraview/appcomponents/CMakeLists.txt

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

smtk/extension/paraview/operators/CMakeLists.txt

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

smtk/extension/paraview/server/CMakeLists.txt

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

smtk/extension/paraview/widgets/CMakeLists.txt

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

smtk/plugin/CMakeLists.txt

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