Fix (another) TypeError when CMAKE_GENERATOR isn't present (#143)

Follow-up to 6c4985b Follow-up to 82bed70
colcon · Nov 22, 2024 · 448bef9 · 448bef9
1 parent 8a69a89
commit 448bef9
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/colcon_cmake/task/cmake/__init__.py b/colcon_cmake/task/cmake/__init__.py
@@ -109,10 +109,11 @@ def get_buildfile(cmake_cache):
     """
     generator = get_variable_from_cmake_cache(
         str(cmake_cache.parent), 'CMAKE_GENERATOR')
-    if generator and 'Ninja' in generator:
-        return cmake_cache.parent / 'build.ninja'
-    if 'Visual Studio' in generator:
-        return cmake_cache.parent / 'ALL_BUILD.vcxproj'
+    if generator is not None:
+        if 'Ninja' in generator:
+            return cmake_cache.parent / 'build.ninja'
+        if 'Visual Studio' in generator:
+            return cmake_cache.parent / 'ALL_BUILD.vcxproj'
     return cmake_cache.parent / 'Makefile'