Merge topic 'project_ui_change'

37856c5b

 Update to the revised syntax for omitting project UI
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !870

packages/ace3p/ace3p.configure.cmake

@@ -17,10 +17,10 @@ list(APPEND smtk_plugin_omit
   smtkMeshPlugin
   smtkMeshSessionPlugin
   smtkOscillatorSessionPlugin
+  smtkPQProjectPlugin
   smtkPVMeshExtPlugin
   smtkPolygonSessionPlugin)
 set_property(GLOBAL PROPERTY smtk_plugins_omit ${smtk_plugin_omit})
-#set_property(GLOBAL APPEND PROPERTY cmb_extra_python_modules smtksimulationace3p)
 set_property(GLOBAL APPEND PROPERTY cmb_extra_plugins ace3p-extensions)
 set_property(GLOBAL APPEND PROPERTY cmb_extra_dependencies smtkace3p)
 
@@ -40,8 +40,7 @@ if (ace3p_target_system STREQUAL "NERSC/Cori")
 endif ()
 
 set_property(GLOBAL APPEND PROPERTY smtk_extra_package_cmake_arguments
-  -DSMTK_ENABLE_OPERATION_THREADS:BOOL=OFF
-  -DSMTK_ENABLE_PROJECT_UI:BOOL=OFF)
+  -DSMTK_ENABLE_OPERATION_THREADS:BOOL=OFF)
 
 set_property(GLOBAL APPEND PROPERTY cmb_extra_package_cmake_arguments
   -Dcmb_enable_multiservers:BOOL=ON

packages/cmb2d/cmb2d.configure.cmake

@@ -12,7 +12,8 @@ set(cmb2d_extra_projects
 list(APPEND superbuild_extra_package_projects "${cmb2d_extra_projects}")
 
 list(APPEND smtk_plugin_omit
-  smtkOscillatorSessionPlugin)
+  smtkOscillatorSessionPlugin
+  smtkPQProjectPlugin)
 set_property(GLOBAL PROPERTY smtk_plugins_omit ${smtk_plugin_omit})
 set_property(GLOBAL APPEND PROPERTY cmb_extra_python_modules smtksimulationcmb2d)
 set_property(GLOBAL APPEND PROPERTY cmb_extra_plugins cmb2d-extensions XMSMeshOperation)
@@ -30,8 +31,7 @@ set(ENABLE_smtkresourcemanagerstate OFF)
 
 # Note: async opertions are not compatible with the python export operation
 set_property(GLOBAL APPEND PROPERTY smtk_extra_package_cmake_arguments
-  -DSMTK_ENABLE_OPERATION_THREADS:BOOL=OFF
-  -DSMTK_ENABLE_PROJECT_UI:BOOL=OFF)
+  -DSMTK_ENABLE_OPERATION_THREADS:BOOL=OFF)
 
 # Use the legacy object picking mode
 set_property(GLOBAL APPEND PROPERTY cmb_extra_package_cmake_arguments

packages/mb-docker/mb-docker.configure.cmake

@@ -20,8 +20,7 @@ set_property(GLOBAL PROPERTY smtk_plugins_omit ${smtk_plugin_omit})
 set_property(GLOBAL APPEND PROPERTY cmb_extra_package_cmake_arguments "-Dcmb_enable_pythonshell:BOOL=ON")
 # Currently cannot support python operations with threads
 set_property(GLOBAL APPEND PROPERTY smtk_extra_package_cmake_arguments
-  -DSMTK_ENABLE_OPERATION_THREADS:BOOL=OFF
-  -DSMTK_ENABLE_PROJECT_UI:BOOL=OFF)
+  -DSMTK_ENABLE_OPERATION_THREADS:BOOL=OFF)
 
 # Configure options
 set(ENABLE_cmbworkflows ON)

packages/truchas/truchas.configure.cmake

@@ -16,6 +16,7 @@ list(APPEND smtk_plugin_omit
   smtkMeshPlugin
   smtkMeshSessionPlugin
   smtkOscillatorSessionPlugin
+  smtkPQProjectPlugin
   smtkPVMeshExtPlugin
   smtkPolygonSessionPlugin)
 set_property(GLOBAL PROPERTY smtk_plugins_omit ${smtk_plugin_omit})
@@ -30,8 +31,7 @@ set(ENABLE_cmb ON)
 set(ENABLE_smtkresourcemanagerstate OFF)
 
 set_property(GLOBAL APPEND PROPERTY smtk_extra_package_cmake_arguments
-  -DSMTK_ENABLE_OPERATION_THREADS:BOOL=OFF
-  -DSMTK_ENABLE_PROJECT_UI:BOOL=OFF)
+  -DSMTK_ENABLE_OPERATION_THREADS:BOOL=OFF)
 
 if (DEVELOPER_MODE_smtk)
   message(FATAL_ERROR "Cannot build in truchas packaging mode if DEVELOPER_MODE_smtk is ON")

projects/smtk.cmake

@@ -92,7 +92,6 @@ superbuild_add_project(smtk
     -DSMTK_ENABLE_EXODUS_SESSION:BOOL=${paraview_enabled}
     -DSMTK_ENABLE_PYTHON_WRAPPING:BOOL=${smtk_enable_python_wrapping}
     -DSMTK_ENABLE_MATPLOTLIB:BOOL=${matplotlib_enabled}
-    -DSMTK_ENABLE_PROJECT_UI:BOOL=ON
     -DSMTK_USE_PYBIND11:BOOL=${pybind11_enabled}
     # SMTK_USE_SYSTEM_MOAB should go away after CMB's SMTK is bumped to master:
     -DSMTK_USE_SYSTEM_MOAB:BOOL=ON