fix: set the cmake generator platform for cross-compile

Author: aminya

src/argumentBuilder.ts

@@ -117,6 +117,9 @@ export class ArgumentBuilder {
         const targetArch = getMsvcArch(this.config.arch)
         const msvcArch = hostArch === targetArch ? hostArch : `${hostArch}_${targetArch}`
         setupMSVCDevCmd(msvcArch)
+
+        // set the CMake generator platform to the target architecture
+        retVal.push(["CMAKE_GENERATOR_PLATFORM", cmakeArch])
       }
     }
 

src/config.ts

@@ -1,7 +1,7 @@
 import { join, resolve } from "path"
 import { readJson } from "fs-extra"
 import which from "which"
-import { getCmakeGenerator } from "./util.js"
+import { getCmakeGenerator } from "./generator.js"
 
 /**
  * The options of cmake-ts that includes the command to run and the global options
@@ -335,7 +335,7 @@ async function addMissingBuildConfigurationFields(
 
   config.cmakeToUse ??= globalConfig.cmakeToUse ?? (await which("cmake", { nothrow: true })) ?? "cmake"
 
-  const { generator, binary } = await getCmakeGenerator(config.cmakeToUse, process.arch)
+  const { generator, binary } = await getCmakeGenerator(config.cmakeToUse, config.arch)
   config.generatorToUse ??= globalConfig.generatorToUse ?? generator
   config.generatorBinary ??= globalConfig.generatorBinary ?? binary
 

src/generator.ts

@@ -0,0 +1,76 @@
+import which from "which"
+import { logger } from "./logger.js"
+import { execCapture } from "./util.js"
+
+export async function getCmakeGenerator(
+  cmake: string,
+  arch: string,
+): Promise<{
+  generator: string | undefined
+  binary: string | undefined
+}> {
+  // use ninja if available
+  if (process.platform !== "win32") {
+    const ninja = await which("ninja", { nothrow: true })
+    if (ninja !== null) {
+      return {
+        generator: "Ninja",
+        binary: ninja,
+      }
+    }
+  }
+
+  // use the MSVC generator on Windows
+  if (process.platform === "win32" && ["x64", "x86"].includes(arch)) {
+    try {
+      const archString = arch === "x64" ? "Win64" : arch === "x86" ? "" : <never>undefined
+
+      const generators = await execCapture(`"${cmake}" -G`)
+      logger.debug(generators)
+      const hasCR = generators.includes("\r\n")
+      const output = hasCR ? generators.split("\r\n") : generators.split("\n")
+      let found = false
+      let useVSGen = ""
+
+      for (const line of output) {
+        if (!found && line.trim() === "Generators") {
+          found = true
+          continue
+        }
+        const genParts = line.split("=")
+        if (genParts.length <= 1) {
+          // Some descriptions are multi-line
+          continue
+        }
+        /** Current MSVS compiler selected in Windows generally is prefixed with "* " */
+        genParts[0] = genParts[0].replace(/^(\* )/, "").trim()
+
+        // eslint-disable-next-line optimize-regex/optimize-regex
+        if (genParts[0].match(/Visual\s+Studio\s+\d+\s+\d+(\s+\[arch\])?/)) {
+          // The first entry is usually the latest entry
+          useVSGen = genParts[0]
+          break
+        }
+      }
+      const useSwitch = !useVSGen.match(/.*\[arch]/)
+      if (useSwitch) {
+        useVSGen += " -A" // essentially using this as a flag
+      } else {
+        useVSGen = useVSGen.replace("[arch]", archString).trim()
+      }
+      logger.debug("Using generator: ", useVSGen)
+      return {
+        generator: useVSGen,
+        binary: undefined,
+      }
+    } catch (e) {
+      logger.warn("Failed to find valid VS gen, using native.")
+      // fall back to native
+    }
+  }
+
+  return {
+    generator: "native",
+    binary: undefined,
+  }
+}

src/util.ts

@@ -1,8 +1,6 @@
 import * as cp from "child_process"
 import { type PathLike, type StatOptions, type Stats, type StatsBase, stat as rawStat } from "fs-extra"
 import splitargs from "splitargs2"
-import which from "which"
-import { logger } from "./logger.js"
 
 export function getEnvVar(name: string) {
   const value = process.env[name]
@@ -12,70 +10,6 @@ export function getEnvVar(name: string) {
   return undefined
 }
 
-export async function getCmakeGenerator(
-  cmake: string,
-  arch: string,
-): Promise<{
-  generator: string | undefined
-  binary: string | undefined
-}> {
-  // use ninja if available
-  const ninja = await which("ninja", { nothrow: true })
-  if (ninja !== null) {
-    return {
-      generator: "Ninja",
-      binary: ninja,
-    }
-  }
-
-  const archString = arch === "x64" ? "Win64" : arch === "x86" ? "" : null
-  if (archString === null) {
-    logger.error("Failed to find valid VS gen, using native. Good Luck.")
-    return {
-      generator: "native",
-      binary: undefined,
-    }
-  }
-
-  const generators = await execCapture(`"${cmake}" -G`)
-  const hasCR = generators.includes("\r\n")
-  const output = hasCR ? generators.split("\r\n") : generators.split("\n")
-  let found = false
-  let useVSGen = ""
-
-  for (const line of output) {
-    if (!found && line.trim() === "Generators") {
-      found = true
-      continue
-    }
-    const genParts = line.split("=")
-    if (genParts.length <= 1) {
-      // Some descriptions are multi-line
-      continue
-    }
-    /** Current MSVS compiler selected in Windows generally is prefixed with "* " */
-    genParts[0] = genParts[0].replace(/^(\* )/, "").trim()
-
-    // eslint-disable-next-line optimize-regex/optimize-regex
-    if (genParts[0].match(/Visual\s+Studio\s+\d+\s+\d+(\s+\[arch\])?/)) {
-      logger.debug("Found generator: ", genParts[0])
-      // The first entry is usually the latest entry
-      useVSGen = genParts[0]
-      break
-    }
-  }
-  const useSwitch = !useVSGen.match(/.*\[arch]/)
-  if (useSwitch) {
-    useVSGen += " -A" // essentially using this as a flag
-  } else {
-    useVSGen = useVSGen.replace("[arch]", archString).trim()
-  }
-  return {
-    generator: useVSGen,
-    binary: undefined,
-  }
-}
-
 export function execCapture(command: string): Promise<string> {
   return new Promise((resolve) => {
     cp.exec(command, (_, stdout, stderr) => {