2024-03-14 20:24:55 +01:00

39 lines
1.4 KiB
Diff

--- scikit_build_core-0.8.2/src/scikit_build_core/program_search.py 2020-02-02 01:00:00.000000000 +0100
+++ scikit_build_core-0.8.2-yocto/src/scikit_build_core/program_search.py 2024-03-14 14:35:34.768039243 +0100
@@ -38,12 +38,12 @@ def _get_cmake_path(*, module: bool = Tr
"""
Get the path to CMake.
"""
- if module:
- with contextlib.suppress(ImportError):
- # If a "cmake" directory exists, this will also ImportError
- from cmake import CMAKE_BIN_DIR
-
- yield Path(CMAKE_BIN_DIR) / "cmake"
+# if module:
+# with contextlib.suppress(ImportError):
+# # If a "cmake" directory exists, this will also ImportError
+# from cmake import CMAKE_BIN_DIR
+#
+# yield Path(CMAKE_BIN_DIR) / "cmake"
candidates = ("cmake3", "cmake")
for candidate in candidates:
@@ -57,11 +57,11 @@ def _get_ninja_path(*, module: bool = Tr
Get the path to ninja.
"""
- if module:
- with contextlib.suppress(ImportError):
- from ninja import BIN_DIR
-
- yield Path(BIN_DIR) / "ninja"
+# if module:
+# with contextlib.suppress(ImportError):
+# from ninja import BIN_DIR
+#
+# yield Path(BIN_DIR) / "ninja"
# Matches https://gitlab.kitware.com/cmake/cmake/-/blob/master/Modules/CMakeNinjaFindMake.cmake
candidates = ("ninja-build", "ninja", "samu")