From 813266e1fde13fc0dd9fea031cbe0e9923efaf46 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Sun, 5 Jan 2025 18:23:57 +0100 Subject: [PATCH] wip --- dodo.py | 12 ++++++++---- rhubarb/CMakeLists.txt | 2 +- rhubarb/CMakePresets.json | 10 ++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 rhubarb/CMakePresets.json diff --git a/dodo.py b/dodo.py index 92482cf..c8bb036 100644 --- a/dodo.py +++ b/dodo.py @@ -79,13 +79,14 @@ def format(files: List[Path], formatter: Formatter, *, check_only: bool = False) raise ValueError(f'Unknown formatter: {formatter}') +def configure_rhubarb(): + ensure_dir(rhubarb_build_dir) + subprocess.run(['cmake', '..'], cwd=rhubarb_build_dir, check=True) + + def task_configure_rhubarb(): """Configure CMake for the Rhubarb binary""" - def configure_rhubarb(): - ensure_dir(rhubarb_build_dir) - subprocess.run(['cmake', '..'], cwd=rhubarb_build_dir, check=True) - return {'basename': 'configure-rhubarb', 'actions': [configure_rhubarb]} @@ -93,6 +94,9 @@ def task_build_rhubarb(): """Build the Rhubarb binary""" def build_rhubarb(): + if not rhubarb_build_dir.exists(): + configure_rhubarb() + subprocess.run( ['cmake', '--build', '.', '--config', 'Release'], cwd=rhubarb_build_dir, check=True ) diff --git a/rhubarb/CMakeLists.txt b/rhubarb/CMakeLists.txt index be20efc..c4edf0c 100644 --- a/rhubarb/CMakeLists.txt +++ b/rhubarb/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.19) # Parse app info file(READ "../app-info.toml" tomlContent) diff --git a/rhubarb/CMakePresets.json b/rhubarb/CMakePresets.json new file mode 100644 index 0000000..fdd5d3c --- /dev/null +++ b/rhubarb/CMakePresets.json @@ -0,0 +1,10 @@ +{ + "version": 8, + "$schema": "https://cmake.org/cmake/help/latest/_downloads/3e2d73bff478d88a7de0de736ba5e361/schema.json", + "configurePresets": [ + { + "name": "vs22-msvc", + "description": "Visual Studio 2022 solution compiled with Visual C++" + } + ] +}