Skip to content

Commit bd73f82

Browse files
committed
once again change the cmake sync format sad
1 parent 47e5b94 commit bd73f82

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

cppython/plugins/cmake/schema.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,7 @@ class CMakeSyncData(SyncData):
100100
"""The CMake sync data"""
101101

102102
preset_file: Annotated[Path, Field(description='Path to the CMakePresets.json file generated by the provider.')]
103-
configurations: Annotated[
104-
list[str],
105-
Field(
106-
description='List of configurations to generate presets for. Preset names are generated via '
107-
'the `provider_name` field with an appended suffix.'
108-
),
109-
] = [
110-
'Release',
111-
'Debug',
112-
]
103+
toolchain: Path | None = None
113104

114105

115106
class CMakeData(CPPythonModel):

cppython/plugins/vcpkg/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def _create_cmake_sync_data(self) -> CMakeSyncData:
125125

126126
return CMakeSyncData(
127127
provider_name=TypeName('vcpkg'),
128-
preset_file=provider_preset_path,
128+
toolchain=vcpkg_cmake_path,
129129
)
130130

131131
@classmethod

tests/integration/examples/test_conan_cmake.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from pathlib import Path
99
from tomllib import loads
1010

11-
import pytest
1211
from typer.testing import CliRunner
1312

1413
from cppython.console.schema import ConsoleInterface
@@ -18,7 +17,6 @@
1817
pytest_plugins = ['tests.fixtures.example', 'tests.fixtures.conan']
1918

2019

21-
@pytest.mark.skip(reason='TODO')
2220
class TestConanCMake:
2321
"""Test project variation of conan and CMake"""
2422

0 commit comments

Comments
 (0)