[SQUASH] Debug library paths on Windows.

Add a special case for Windows.

Author: hageboeck

bindings/pyroot/cppyy/cppyy/python/cppyy/__init__.py

@@ -340,9 +340,16 @@ def add_library_path(path):
         apipath_extra = os.path.join(os.path.dirname(apipath), 'site', 'python'+ldversion)
         if not os.path.exists(os.path.join(apipath_extra, 'CPyCppyy')):
             import glob
+            import platform
 
-            import cppyy.libcppyy as libcppyy
-            ape = os.path.dirname(libcppyy.__file__)
+            if platform.system() == "Windows":
+                # On Windows, the library is found directly
+                import libcppyy
+                ape = os.path.dirname(libcppyy.__file__)
+                print("libcppyy was found in", ape)
+            else:
+                import cppyy.libcppyy as libcppyy
+                ape = os.path.dirname(libcppyy.__file__)
           # a "normal" structure finds the include directory up to 3 levels up,
           # ie. dropping lib/pythonx.y[md]/site-packages
             for i in range(3):

bindings/pyroot/cppyy/cppyy/python/cppyy/_cpython_cppyy.py

@@ -2,6 +2,7 @@
 """
 
 import ctypes
+import platform
 import sys
 
 from . import _stdcpp_fix
@@ -27,7 +28,12 @@
 except ImportError:
     c = None
 
-import cppyy.libcppyy as _backend
+if platform.system() == "Windows":
+    # On Windows, the library has to be searched without prefix
+    import libcppyy as _backend
+    print("libcppyy was found in", _backend.__file__)
+else:
+    import cppyy.libcppyy as _backend
 
 if c is not None:
     _backend._cpp_backend = c