Skip to content

Commit 099aa58

Browse files
authored
fix: minor touchup to ninja / make (#167)
Followup to #166.
1 parent b9dd0e0 commit 099aa58

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/scikit_build_core/builder/generator.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,25 +73,25 @@ def set_environment_for_gen(
7373
env.setdefault("CMAKE_GENERATOR", default)
7474
env.setdefault("CMAKE_GENERATOR_PLATFORM", get_cmake_platform(env))
7575
return {}
76-
if env.get("CMAKE_GENERATOR", "Ninja") == "Ninja" and not env.get(
77-
"CMAKE_MAKE_PROGRAM", ""
78-
):
79-
ninja = best_program(
80-
get_ninja_programs(),
81-
minimum_version=Version(ninja_settings.minimum_version),
82-
)
76+
77+
if env.get("CMAKE_GENERATOR", default or "Ninja") == "Ninja":
78+
min_ninja = Version(ninja_settings.minimum_version)
79+
ninja = best_program(get_ninja_programs(), minimum_version=min_ninja)
80+
8381
if ninja is not None:
8482
env.setdefault("CMAKE_GENERATOR", "Ninja")
8583
logger.debug("CMAKE_GENERATOR: Using ninja: {}", ninja.path)
8684
return {"CMAKE_MAKE_PROGRAM": str(ninja.path)}
8785

88-
msg = "Ninja or make is required to build"
86+
msg = "Ninja is required to build"
8987
if not ninja_settings.make_fallback:
9088
raise NinjaNotFoundError(msg)
9189

90+
msg = "Ninja or make is required to build"
9291
make_programs = list(get_make_programs())
9392
if not make_programs:
9493
raise NinjaNotFoundError(msg)
94+
9595
env.setdefault("CMAKE_GENERATOR", "Unix Makefiles")
9696
logger.debug("CMAKE_GENERATOR: Using make: {}", make_programs[0])
9797
return {"CMAKE_MAKE_PROGRAM": str(make_programs[0])}

0 commit comments

Comments
 (0)