An update will be applied today, Nov30th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit ff8d53ae authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot
Browse files

Merge topic 'static-python-fixes'

ae108b61

 Revert "Be explicit when importing _vtkmodules_static"
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: David Gobbi's avatarDavid Gobbi <david.gobbi@gmail.com>
Merge-request: !8428
parents eeafcb26 ae108b61
......@@ -65,12 +65,6 @@ if (NOT VTK_WHEEL_BUILD)
endif ()
endif ()
# goes in __init__.py for when vtkmodules is BUILD_STATIC
set(_vtkmodules_static_import "import _vtkmodules_static")
if (BUILD_SHARED_LIBS)
string(PREPEND _vtkmodules_static_import "#")
endif ()
set(_vtkmodules_all)
set(_vtk_python_imports)
foreach (_vtk_python_module IN LISTS vtk_python_wrapped_modules)
......
......@@ -48,7 +48,10 @@ if sys.version_info >= (3, 8) and sys.platform == 'win32':
# the user imports this Python package in a non-statically linked Python
# interpreter i.e. not of the of the VTK-python executables, then we import the
# static components importer module.
@_vtkmodules_static_import@
try:
from . import vtkCommonCore
except ImportError:
import _vtkmodules_static
#------------------------------------------------------------------------------
# list the contents
......
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