From 9607ee840054c0c64d6de775e615dff3d6a54ee4 Mon Sep 17 00:00:00 2001 From: Kazys Stepanas Date: Mon, 13 Sep 2021 22:15:11 +1000 Subject: [PATCH] Add support for `Ninja Multi-Config` (#106) - Add `Ninja Multi-Config` generator as a match for a `Ninja` generator - Add `Ninja Multi-Config` to the set of generators where `is_multi_configuration_generator()` is `True` - Fix a 'Ninja' generator check to be multi-config compatible. --- colcon_cmake/task/cmake/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/colcon_cmake/task/cmake/__init__.py b/colcon_cmake/task/cmake/__init__.py index a249f01..35eb0af 100644 --- a/colcon_cmake/task/cmake/__init__.py +++ b/colcon_cmake/task/cmake/__init__.py @@ -109,7 +109,7 @@ def get_buildfile(cmake_cache): """ generator = get_variable_from_cmake_cache( str(cmake_cache.parent), 'CMAKE_GENERATOR') - if generator == 'Ninja': + if 'Ninja' in generator: return cmake_cache.parent / 'build.ninja' return cmake_cache.parent / 'Makefile' @@ -148,6 +148,7 @@ def is_multi_configuration_generator(path, cmake_args=None): :rtype: bool """ known_multi_configuration_generators = ( + 'Ninja Multi-Config', 'Visual Studio', 'Xcode', )