@@ -73,25 +73,25 @@ def set_environment_for_gen(
73
73
env .setdefault ("CMAKE_GENERATOR" , default )
74
74
env .setdefault ("CMAKE_GENERATOR_PLATFORM" , get_cmake_platform (env ))
75
75
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
+
83
81
if ninja is not None :
84
82
env .setdefault ("CMAKE_GENERATOR" , "Ninja" )
85
83
logger .debug ("CMAKE_GENERATOR: Using ninja: {}" , ninja .path )
86
84
return {"CMAKE_MAKE_PROGRAM" : str (ninja .path )}
87
85
88
- msg = "Ninja or make is required to build"
86
+ msg = "Ninja is required to build"
89
87
if not ninja_settings .make_fallback :
90
88
raise NinjaNotFoundError (msg )
91
89
90
+ msg = "Ninja or make is required to build"
92
91
make_programs = list (get_make_programs ())
93
92
if not make_programs :
94
93
raise NinjaNotFoundError (msg )
94
+
95
95
env .setdefault ("CMAKE_GENERATOR" , "Unix Makefiles" )
96
96
logger .debug ("CMAKE_GENERATOR: Using make: {}" , make_programs [0 ])
97
97
return {"CMAKE_MAKE_PROGRAM" : str (make_programs [0 ])}
0 commit comments