Skip to content

Commit d6a7c2c

Browse files
authored
Merge pull request #31 from omjavaid/fix_usemake_ninja
Automatically set Ninja generator for --use-make=ninja
2 parents a57eea6 + 1909e5a commit d6a7c2c

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

lnt/tests/test_suite.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,11 @@ def _configure(self, path, extra_cmake_defs=[], execute=True):
448448
defs['CMAKE_CXX_COMPILER'] = self.opts.cxx
449449
if self.opts.make:
450450
defs['CMAKE_MAKE_PROGRAM'] = self.opts.make
451+
if self.opts.make and (self.opts.make.endswith('ninja') or
452+
self.opts.make.endswith('ninja.exe')):
453+
cmake_flags = ['-G', 'Ninja']
454+
else:
455+
cmake_flags = []
451456

452457
cmake_build_types = ('DEBUG', 'MINSIZEREL', 'RELEASE',
453458
'RELWITHDEBINFO')
@@ -520,7 +525,6 @@ def _configure(self, path, extra_cmake_defs=[], execute=True):
520525
self.remote_run = True
521526

522527
# Prepare cmake cache if requested:
523-
cmake_flags = []
524528
for cache in self.opts.cmake_cache:
525529
if cache == "":
526530
continue

0 commit comments

Comments
 (0)