Fix Relative Test

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,8 +47,7 @@ def generate_cppython_preset(
         )
 
         if provider_data.toolchain_file:
-            # Make toolchain file path relative to the preset directory
-            relative_toolchain = provider_data.toolchain_file.relative_to(cppython_preset_directory, walk_up=True)
+            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)
@@ -57,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(

tests/unit/plugins/cmake/test_presets.py

@@ -87,7 +87,9 @@ def test_root_write(project_data: ProjectData) -> None:
 
         data = CMakeSyncData(provider_name=TypeName('test-provider'))
 
-        cppython_preset_file = builder.write_cppython_preset(cppython_preset_directory, provider_preset_file, data)
+        cppython_preset_file = builder.write_cppython_preset(
+            cppython_preset_directory, provider_preset_file, data, project_data.project_root
+        )
 
         build_directory = project_data.project_root / 'build'
         builder.write_root_presets(
@@ -133,7 +135,11 @@ def test_relative_root_write(project_data: ProjectData) -> None:
 
         data = CMakeSyncData(provider_name=TypeName('test-provider'))
 
-        cppython_preset_file = builder.write_cppython_preset(cppython_preset_directory, provider_preset_file, data)
+        # For this test, the root file is in a relative indirection subdirectory
+        project_root = root_file.parent
+        cppython_preset_file = builder.write_cppython_preset(
+            cppython_preset_directory, provider_preset_file, data, project_root
+        )
 
         build_directory = project_data.project_root / 'build'
         builder.write_root_presets(