Update Chore

Author: Behemyth

cppython/plugins/cmake/builder.py

@@ -19,14 +19,18 @@ def __init__(self) -> None:
 
     @staticmethod
     def generate_cppython_preset(
-        cppython_preset_directory: Path, provider_preset_file: Path, provider_data: CMakeSyncData
+        cppython_preset_directory: Path,
+        provider_preset_file: Path,
+        provider_data: CMakeSyncData,
+        project_root: Path,
     ) -> CMakePresets:
         """Generates the cppython preset which inherits from the provider presets
 
         Args:
             cppython_preset_directory: The tool directory
             provider_preset_file: Path to the provider's preset file
             provider_data: The provider's synchronization data
+            project_root: The project root directory (where CMakeLists.txt is located)
 
         Returns:
             A CMakePresets object
@@ -43,7 +47,8 @@ def generate_cppython_preset(
         )
 
         if provider_data.toolchain_file:
-            default_configure.toolchainFile = provider_data.toolchain_file.as_posix()
+            relative_toolchain = provider_data.toolchain_file.relative_to(project_root, walk_up=True)
+            default_configure.toolchainFile = relative_toolchain.as_posix()
 
         configure_presets.append(default_configure)
 
@@ -55,20 +60,24 @@ def generate_cppython_preset(
 
     @staticmethod
     def write_cppython_preset(
-        cppython_preset_directory: Path, provider_preset_file: Path, provider_data: CMakeSyncData
+        cppython_preset_directory: Path,
+        provider_preset_file: Path,
+        provider_data: CMakeSyncData,
+        project_root: Path,
     ) -> Path:
         """Write the cppython presets which inherit from the provider presets
 
         Args:
             cppython_preset_directory: The tool directory
             provider_preset_file: Path to the provider's preset file
             provider_data: The provider's synchronization data
+            project_root: The project root directory (where CMakeLists.txt is located)
 
         Returns:
             A file path to the written data
         """
         generated_preset = Builder.generate_cppython_preset(
-            cppython_preset_directory, provider_preset_file, provider_data
+            cppython_preset_directory, provider_preset_file, provider_data, project_root
         )
         cppython_preset_file = cppython_preset_directory / 'cppython.json'
 

cppython/plugins/cmake/plugin.py

@@ -66,8 +66,10 @@ def sync(self, sync_data: SyncData) -> None:
 
                 cppython_preset_file = self._cppython_preset_directory / 'CPPython.json'
 
+                project_root = self.core_data.project_data.project_root
+
                 cppython_preset_file = self.builder.write_cppython_preset(
-                    self._cppython_preset_directory, cppython_preset_file, sync_data
+                    self._cppython_preset_directory, cppython_preset_file, sync_data, project_root
                 )
 
                 self.builder.write_root_presets(

cppython/plugins/conan/builder.py

@@ -124,6 +124,7 @@ def __init__(self) -> None:
     def _create_conanfile(conan_file: Path, dependencies: list[ConanDependency], name: str, version: str) -> None:
         """Creates a conanfile.py file with the necessary content."""
         template_string = """
+        import os
         from conan import ConanFile
         from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
         from conan.tools.files import copy
@@ -154,7 +155,10 @@ def package(self):
                 cmake.install()
 
             def package_info(self):
-                self.cpp_info.libs = ["${name}"]
+                # Use native CMake config files to preserve FILE_SET information for C++ modules
+                # This tells CMakeDeps to skip generating files and use the package's native config
+                self.cpp_info.set_property("cmake_find_mode", "none")
+                self.cpp_info.builddirs = ["."]
 
             def export_sources(self):
                 copy(self, "CMakeLists.txt", src=self.recipe_folder, dst=self.export_sources_folder)

examples/conan_cmake/library/test_package/CMakeLists.txt

@@ -1,9 +1,13 @@
 cmake_minimum_required(VERSION 4.0)
 
+# Enable std module support for MSVC - MUST be before project()
+set(CMAKE_EXPERIMENTAL_CXX_IMPORT_STD "d0edc3af-4c50-42ea-a356-e2862fe7a444")
+
 project(MathUtilsConsumer LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_MODULE_STD ON)
 
 find_package(mathutils REQUIRED)