Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

waf: cmake: define a dictionary of supported generators 

On Windows, using MSYS Makefiles generator doesn't work very well when the
CMakeLists.txt files use custom commands with paths as arguments. Furthermore,
MinGW Makefiles generator can't be used if sh.exe is in the system's path and
some build systems rely on sh for certain tasks (which is the case of PX4
Firmware build). Because of that, the list of generators for Windows has been
narrowed to Ninja and NMake Makefiles.
This commit is contained in:
Gustavo Jose de Sousa 2016-08-18 18:20:44 -03:00 committed by Lucas De Marchi
parent 07592d650e
commit a6b55d90a7
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Tools/ardupilotwaf/cmake.py
View File

@ -381,13 +381,28 @@ def _check_min_version(cfg):
cfg.fatal('cmake must be at least at version %s' % minver_str) cfg.fatal('cmake must be at least at version %s' % minver_str)
cfg.end_msg(m.group(0)) cfg.end_msg(m.group(0))
generators = dict(
default=[
(['ninja', 'ninja-build'], 'Ninja'),
(['make'], 'Unix Makefiles'),
],
win32=[
(['ninja', 'ninja-build'], 'Ninja'),
(['nmake'], 'NMake Makefiles'),
],
)
def configure(cfg): def configure(cfg):
cfg.find_program('cmake') cfg.find_program('cmake')
if cfg.env.CMAKE_MIN_VERSION: if cfg.env.CMAKE_MIN_VERSION:
_check_min_version(cfg) _check_min_version(cfg)
cfg.find_program(['ninja', 'ninja-build'], var='NINJA', mandatory=False) l = generators.get(Utils.unversioned_sys_platform(), generators['default'])
cfg.env.CMAKE_GENERATOR_OPTION = '' for names, generator in l:
if cfg.env.NINJA: if cfg.find_program(names, mandatory=False):
cfg.env.CMAKE_GENERATOR_OPTION = '-GNinja' cfg.env.CMAKE_GENERATOR_OPTION = '-G%s' % generator
break
else:
cfg.fatal("cmake: couldn't find a suitable CMake generator. " +
"The ones supported by this Waf tool for this platform are: %s" % ', '.join(g for _, g in l))