refactor: sync viennaps changes

python/CMakeLists.txt

@@ -10,8 +10,15 @@ add_custom_target(${PROJECT_NAME} ALL)
 
 set(CMAKE_MACOSX_RPATH ON)
 
-list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN")
-list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN/../vtkmodules")
+if(NOT APPLE)
+  list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN")
+  list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN/../vtkmodules")
+  list(APPEND CMAKE_INSTALL_RPATH "$ORIGIN/../viennals.libs")
+else()
+  list(APPEND CMAKE_INSTALL_RPATH "@loader_path")
+  list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../vtkmodules")
+  list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../viennals.libs")
+endif()
 
 # --------------------------------------------------------------------------------------------------------
 # Setup Dependencies
@@ -64,3 +71,10 @@ endmacro()
 
 setup_binding(viennals2d -DVIENNALS_PYTHON_DIMENSION=2)
 setup_binding(viennals3d -DVIENNALS_PYTHON_DIMENSION=3)
+
+set(VIENNALS_LIB_FOLDER "${VIENNALS_LIBRARY_OUTPUT_DIR}/viennals.libs")
+
+if(WIN32 AND NOT VIENNALS_SYSTEM_VTK)
+  setup_vtk_env(${MODULE_NAME} "${VIENNALS_LIB_FOLDER}")
+  install(DIRECTORY "${VIENNALS_LIB_FOLDER}" DESTINATION .)
+endif()

python/__init__.py.in

@@ -9,14 +9,25 @@ visualisation applications, although this is not the main design target.
 """
 
 import sys
-from .@MODULE_NAME@ import *
 
 def _windows_dll_path():
 
     import os
     import vtk
 
-    os.add_dll_directory(vtk.__path__)
+    vtk_path = vtk.__path__[0]
+
+    additional_paths = [
+        vtk_path,
+        os.path.join(os.path.dirname(vtk_path), 'vtk.libs'),
+        os.path.join(os.path.dirname(os.path.dirname(__file__)), 'viennals.libs')
+    ]
+
+    for path in additional_paths:
+        os.add_dll_directory(path)
+        os.environ["PATH"] = path + os.pathsep + os.environ["PATH"]
 
 if sys.platform == "win32":
     _windows_dll_path()
+
+from .@MODULE_NAME@ import *