generator

Author: partouf

bin/lib/compiler_utils.py

@@ -455,6 +455,26 @@ def __init__(self, logger, platform: LibraryPlatform = None):
         self.logger = logger
         self.platform = platform or LibraryPlatform.Linux
 
+    def get_cmake_generator(self, make_utility: str = "make") -> List[str]:
+        """
+        Get CMake generator arguments based on platform and make utility.
+
+        This follows the same logic as library_builder.py:
+        - Windows: Always use Ninja
+        - Linux: Use Ninja if make_utility is "ninja"
+
+        Args:
+            make_utility: The make utility to use (e.g., "make", "ninja")
+
+        Returns:
+            List of CMake arguments for generator selection (empty if default)
+        """
+        if self.platform == LibraryPlatform.Windows:
+            return ["-G", "Ninja"]
+        elif self.platform == LibraryPlatform.Linux and make_utility == "ninja":
+            return ["-G", "Ninja"]
+        return []
+
     def resolve_compiler_path(self, compiler_path: str) -> Optional[str]:
         """Resolve compiler path to full path."""
         if not compiler_path:
@@ -556,7 +576,14 @@ def run_cmake_configuration(self, build_dir: Path, env: Dict[str, str]) -> Tuple
         try:
             self.logger.info("Running CMake to detect compiler...")
 
-            cmd = ["cmake", ".."]
+            # Use the same generator logic as library_builder.py
+            generator_args = self.get_cmake_generator("ninja")  # Default to ninja for cache extraction
+
+            cmd = ["cmake"] + generator_args + [".."]
+
+            if generator_args:
+                self.logger.info(f"Using CMake generator: {' '.join(generator_args)}")
+
             result = subprocess.run(cmd, cwd=build_dir, env=env, capture_output=True, text=True, timeout=300)
 
             if result.returncode != 0:

bin/lib/library_builder.py

@@ -21,7 +21,7 @@
 from lib.amazon import get_ssm_param
 from lib.amazon_properties import get_properties_compilers_and_libraries, get_specific_library_version_details
 from lib.binary_info import BinaryInfo
-from lib.compiler_utils import CompilerInfo, PlatformEnvironmentManager
+from lib.compiler_utils import CMakeCacheExtractor, CompilerInfo, PlatformEnvironmentManager
 from lib.installation_context import FetchFailure, PostFailure
 from lib.library_build_config import LibraryBuildConfig
 from lib.library_build_history import LibraryBuildHistory
@@ -119,6 +119,9 @@ def __init__(
         # Initialize shared environment manager
         self.env_manager = PlatformEnvironmentManager(self.platform)
 
+        # Initialize CMake cache extractor for generator logic
+        self.cmake_extractor = CMakeCacheExtractor(self.logger, self.platform)
+
         self.history = LibraryBuildHistory(self.logger)
 
         if self.language in _propsandlibs:
@@ -603,12 +606,9 @@ def writebuildscript(
                                 '"-DBOOST_IOSTREAMS_ENABLE_ZSTD=OFF" "-DBOOST_LOCALE_ENABLE_ICU=OFF" '
                             )
 
-                generator = ""
-                if self.platform == LibraryPlatform.Linux:
-                    if make_utility == "ninja":
-                        generator = "-GNinja"
-                elif self.platform == LibraryPlatform.Windows:
-                    generator = "-GNinja"
+                # Use shared generator logic from CMakeCacheExtractor
+                generator_args = self.cmake_extractor.get_cmake_generator(make_utility)
+                generator = " ".join(generator_args)
 
                 for line in self.buildconfig.prebuild_script:
                     expanded_line = self.expand_build_script_line(