git/SDL3CPlusPlus
1
0
Fork 0
mirror of https://github.com/johndoe6345789/SDL3CPlusPlus.git synced 2026-04-24 21:55:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Update paths for Conan toolchain and presets to use build-ninja layout

Browse Source
This commit is contained in:
johndoe6345789
2026-01-06 13:46:13 +00:00
parent 4e15e08b7f
commit 793fea5e77
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeUserPresets.json
View File

@@ -18,6 +18,7 @@
}
],
"include": [
"build/build/Release/generators/CMakePresets.json"
"build/build/Release/generators/CMakePresets.json",
"build-ninja/build/Release/generators/CMakePresets.json"
]
}

14
scripts/dev_commands.py
View File

@@ -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/<build_type>/generators/conan_toolchain.cmake`.
The default `conan install -of build-ninja` + `cmake_layout()` layout produces
`build-ninja/build/<build_type>/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)