hatch-cpp 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

hatch_cpp/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 from .config import *
 from .hooks import *

hatch_cpp/tests/test_platform_specific.py

@@ -454,3 +454,82 @@ class TestPlatformFieldOrdering:
         # Base list should not be modified
         assert library.include_dirs == ["common"]
         assert library.include_dirs_linux == ["linux"]
+
+
+class TestMSVCPythonLibsPath:
+    """Tests for MSVC Python libs path discovery."""
+
+    def test_msvc_link_flags_include_libpath(self):
+        """Test that MSVC link flags include /LIBPATH for Python libs."""
+        library = HatchCppLibrary(
+            name="test",
+            sources=["test.cpp"],
+            binding="generic",  # Skip Python.h include
+        )
+
+        platform = HatchCppPlatform(
+            cc="cl",
+            cxx="cl",
+            ld="link",
+            platform="win32",
+            toolchain="msvc",
+            disable_ccache=True,
+        )
+
+        flags = platform.get_link_flags(library)
+        # Should have /link /DLL flags
+        assert "/link" in flags
+        assert "/DLL" in flags
+        # Should have output file
+        assert "/Fe:" in flags
+
+    def test_msvc_link_flags_with_libraries(self):
+        """Test that MSVC link flags properly format library names."""
+        library = HatchCppLibrary(
+            name="test",
+            sources=["test.cpp"],
+            binding="generic",
+            libraries=["mylib"],
+            library_dirs=["path/to/libs"],
+        )
+
+        platform = HatchCppPlatform(
+            cc="cl",
+            cxx="cl",
+            ld="link",
+            platform="win32",
+            toolchain="msvc",
+            disable_ccache=True,
+        )
+
+        flags = platform.get_link_flags(library)
+        # Libraries should have .lib suffix on Windows
+        assert "mylib.lib" in flags
+        # Library dirs should use /LIBPATH:
+        assert "/LIBPATH:path/to/libs" in flags
+
+    def test_msvc_link_flags_with_platform_specific_libraries(self):
+        """Test that MSVC uses win32-specific libraries."""
+        library = HatchCppLibrary(
+            name="test",
+            sources=["test.cpp"],
+            binding="generic",
+            libraries=["common"],
+            libraries_win32=["kernel32", "user32"],
+            library_dirs_win32=["C:/Windows/System32"],
+        )
+
+        platform = HatchCppPlatform(
+            cc="cl",
+            cxx="cl",
+            ld="link",
+            platform="win32",
+            toolchain="msvc",
+            disable_ccache=True,
+        )
+
+        flags = platform.get_link_flags(library)
+        assert "common.lib" in flags
+        assert "kernel32.lib" in flags
+        assert "user32.lib" in flags
+        assert "/LIBPATH:C:/Windows/System32" in flags

hatch_cpp/toolchains/common.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from re import match
 from shutil import which
 from sys import executable, platform as sys_platform
-from sysconfig import get_path
+from sysconfig import get_config_var, get_path
 from typing import Any, List, Literal, Optional
 
 from pydantic import AliasChoices, BaseModel, Field, field_validator, model_validator
@@ -368,8 +368,16 @@ class HatchCppPlatform(BaseModel):
             flags += " /LD"
             flags += f" /Fe:{library.get_qualified_name(self.platform)}"
             flags += " /link /DLL"
-            if (Path(executable).parent / "libs").exists():
-                flags += f" /LIBPATH:{str(Path(executable).parent / 'libs')}"
+            # Add Python libs directory - check multiple possible locations
+            python_libs_paths = [
+                Path(executable).parent / "libs",  # Standard Python install
+                Path(executable).parent.parent / "libs",  # Some virtualenv layouts
+                Path(get_config_var("installed_base") or "") / "libs",  # sysconfig approach
+            ]
+            for libs_path in python_libs_paths:
+                if libs_path.exists():
+                    flags += f" /LIBPATH:{str(libs_path)}"
+                    break
             flags += " " + " ".join(f"{lib}.lib" for lib in effective_libraries)
             flags += " " + " ".join(f"/LIBPATH:{lib}" for lib in effective_library_dirs)
         # clean

{hatch_cpp-0.3.1.dist-info → hatch_cpp-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hatch-cpp
-Version: 0.3.1
+Version: 0.3.2
 Summary: Hatch plugin for C++ builds
 Project-URL: Repository, https://github.com/python-project-templates/hatch-cpp
 Project-URL: Homepage, https://github.com/python-project-templates/hatch-cpp

{hatch_cpp-0.3.1.dist-info → hatch_cpp-0.3.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
-hatch_cpp/__init__.py,sha256=NiHzyZHO9thWWlAsLinBL03KdZwgTXAKh3yDMnAIKRs,114
+hatch_cpp/__init__.py,sha256=80s2OK7mGLMGyDOX66_Zwq0K3j37suMBwllbXaq_crU,114
 hatch_cpp/config.py,sha256=LlwDBmD1nir08Y5GOl4wa29h2iJBtNRSzYMGHRVFJUo,3698
 hatch_cpp/hooks.py,sha256=SQkF5WJIgzw-8rvlTzuQvBqdP6K3fHgnh6CZOZFag50,203
 hatch_cpp/plugin.py,sha256=NcIDi7c9KH-_RkPeeCgWKoH5InIjw2eECswazwvGl_c,4304
 hatch_cpp/utils.py,sha256=lxd3U3aMYsTS6DYMc1y17MR16LzgRzv92f_xh87LSg8,297
 hatch_cpp/tests/test_hatch_build.py,sha256=q2IKTFi3Pq99UsOyL84V-C9VtFUs3ZcA9UlA8lpRW54,1553
-hatch_cpp/tests/test_platform_specific.py,sha256=UaqYFoKfdxNG5p4ZlPsCJE50LB8HzzgVDRlYG03YHQM,17722
+hatch_cpp/tests/test_platform_specific.py,sha256=8EFHEv86e0CD1bIruHgLb28yf2pSRF1VgvcX2tK5bRo,20124
 hatch_cpp/tests/test_projects.py,sha256=vs-kHdiHM7pCqM3oGQsSryq5blRi0HyK5QFfHxlJDi8,1773
 hatch_cpp/tests/test_structs.py,sha256=cpzbPLneEbEONzXmPS1S9PL9mbhya4udc4eqTpU9w6w,2576
 hatch_cpp/tests/test_project_basic/pyproject.toml,sha256=eqM1UVpNmJWDfsuO18ZG_VOV9I4tAWgsM5Dhf49X8Nc,694
@@ -57,10 +57,10 @@ hatch_cpp/tests/test_project_pybind_vcpkg/cpp/project/basic.hpp,sha256=LZSfCfhLY
 hatch_cpp/tests/test_project_pybind_vcpkg/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hatch_cpp/toolchains/__init__.py,sha256=anza4tXKxauobWMOUrxX3sEO0qs7sp6VdLXhLae3vkY,64
 hatch_cpp/toolchains/cmake.py,sha256=VQYYqiOu0ZEF0IBuep35Xad7jryWy04-dHYYf7c0XgY,3331
-hatch_cpp/toolchains/common.py,sha256=a8Pp6K5ykR04ZGXirQGx-xDw9xFm65O2sqrZpUlUqws,18165
+hatch_cpp/toolchains/common.py,sha256=fSb6rTCmDbu9mrmB01qo6KnqTV42IPYbuF2betGjBvI,18593
 hatch_cpp/toolchains/vcpkg.py,sha256=Gwv3YNXBngpdebvRuYuUcWCzPyDbmDvy8c0K7uV4k38,2146
-hatch_cpp-0.3.1.dist-info/METADATA,sha256=elXaQLudW-BbNb0B0ZL1YCbMCr39d7GpZUaSQRB_I40,9896
-hatch_cpp-0.3.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hatch_cpp-0.3.1.dist-info/entry_points.txt,sha256=RgXfjpD4iwomJQK5n7FnPkXzb5fOnF5v3DI5hbkgVcw,30
-hatch_cpp-0.3.1.dist-info/licenses/LICENSE,sha256=FWyFTpd5xXEz50QpGDtsyIv6dgR2z_dHdoab_Nq_KMw,11452
-hatch_cpp-0.3.1.dist-info/RECORD,,
+hatch_cpp-0.3.2.dist-info/METADATA,sha256=r1F7u1r__2y464NTdBPPsTxvVQlFRnijdRTbvxrxx50,9896
+hatch_cpp-0.3.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hatch_cpp-0.3.2.dist-info/entry_points.txt,sha256=RgXfjpD4iwomJQK5n7FnPkXzb5fOnF5v3DI5hbkgVcw,30
+hatch_cpp-0.3.2.dist-info/licenses/LICENSE,sha256=FWyFTpd5xXEz50QpGDtsyIv6dgR2z_dHdoab_Nq_KMw,11452
+hatch_cpp-0.3.2.dist-info/RECORD,,