From 793fea5e778728a6787c9a33bcb43b0f31ec1cc5 Mon Sep 17 00:00:00 2001 From: johndoe6345789 Date: Tue, 6 Jan 2026 13:46:13 +0000 Subject: [PATCH] fix: Update paths for Conan toolchain and presets to use build-ninja layout --- CMakeUserPresets.json | 3 ++- scripts/dev_commands.py | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeUserPresets.json b/CMakeUserPresets.json index 699d62d..b1b4a07 100644 --- a/CMakeUserPresets.json +++ b/CMakeUserPresets.json @@ -18,6 +18,7 @@ } ], "include": [ - "build/build/Release/generators/CMakePresets.json" + "build/build/Release/generators/CMakePresets.json", + "build-ninja/build/Release/generators/CMakePresets.json" ] } \ No newline at end of file diff --git a/scripts/dev_commands.py b/scripts/dev_commands.py index e8fcc05..eed17cb 100644 --- a/scripts/dev_commands.py +++ b/scripts/dev_commands.py @@ -233,14 +233,14 @@ def _find_conan_toolchain(build_type: str) -> Path | None: """ Look for the Conan toolchain file in common output locations. - The default `conan install -of build` + `cmake_layout()` layout produces - `build/build//generators/conan_toolchain.cmake`. + The default `conan install -of build-ninja` + `cmake_layout()` layout produces + `build-ninja/build//generators/conan_toolchain.cmake`. """ candidates = [ - Path("build") / "build" / build_type / "generators" / "conan_toolchain.cmake", - Path("build") / build_type / "generators" / "conan_toolchain.cmake", - Path("build") / "generators" / "conan_toolchain.cmake", - Path("build") / "conan_toolchain.cmake", + Path("build-ninja") / "build" / build_type / "generators" / "conan_toolchain.cmake", + Path("build-ninja") / build_type / "generators" / "conan_toolchain.cmake", + Path("build-ninja") / "generators" / "conan_toolchain.cmake", + Path("build-ninja") / "conan_toolchain.cmake", ] for candidate in candidates: if candidate.is_file(): @@ -256,7 +256,7 @@ def _has_cmake_cache(build_dir: str) -> bool: def dependencies(args: argparse.Namespace) -> None: """Run Conan profile detection and install dependencies.""" cmd_detect = ["conan", "profile", "detect", "-f"] - cmd_install = ["conan", "install", ".", "-of", "build", "-b", "missing", "-c", "tools.build:cxxflags=[\"-include\",\"cstdint\"]"] + cmd_install = ["conan", "install", ".", "-of", "build-ninja", "-b", "missing", "-c", "tools.build:cxxflags=[\"-include\",\"cstdint\"]"] conan_install_args = _strip_leading_double_dash(args.conan_install_args) if conan_install_args: cmd_install.extend(conan_install_args)