fix: prefer MSVC dev variables over CMake generator platform

Author: aminya

src/argumentBuilder.ts

@@ -18,7 +18,7 @@ export class ArgumentBuilder {
     baseCommand += ` ${defines.map((d) => `-D${d[0]}="${d[1]}"`).join(" ")}`
     if (this.config.generatorToUse !== "native") {
       baseCommand += ` -G"${this.config.generatorToUse}"`
-      if (this.config.generatorFlags !== undefined) {
+      if (this.config.generatorFlags !== undefined && defines.some((d) => d[0] === "CMAKE_GENERATOR_PLATFORM")) {
         baseCommand += ` ${this.config.generatorFlags.map((f) => `"${f}"`).join(" ")}`
       }
     }
@@ -111,13 +111,15 @@ export class ArgumentBuilder {
       }
 
       if (this.config.os === "win32") {
-        const hostArch = getMsvcArch(this.config.arch)
-        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])
+        try {
+          setupMSVCDevCmd(this.config.arch)
+        } catch (e) {
+          logger.warn(
+            `Failed to setup MSVC variables for ${this.config.arch}: ${e}. Using CMake generator platform instead.`,
+          )
+          // set the CMake generator platform to the target architecture
+          retVal.push(["CMAKE_GENERATOR_PLATFORM", cmakeArch])
+        }
       }
     }
 

src/generator.ts

@@ -47,8 +47,14 @@ export const getCmakeGenerator = memoizee(
         if (matchedGeneratorLine !== undefined) {
           const [_line, parsedGenerator, archBracket] = matchedGeneratorLine
           const useArchSwitch = (archBracket as string | undefined) === undefined
-          const generator = useArchSwitch ? parsedGenerator : `${parsedGenerator} ${arch === "x64" ? "Win64" : arch === "ia32" ? "Win32" : ""}`
-          const generatorFlags = useArchSwitch ? ["-A", getCMakeArchitecture(arch, os)] : undefined;
+          const archString = arch === "x64" ? " Win64" : arch === "ia32" ? " Win32" : ""
+          if (archString === "") {
+            logger.warn(
+              `Unsupported architecture: ${arch} for generator ${parsedGenerator}. Using without arch specification.`,
+            )
+          }
+          const generator = useArchSwitch ? parsedGenerator : `${parsedGenerator}${archString}`
+          const generatorFlags = useArchSwitch ? ["-A", getCMakeArchitecture(arch, os)] : undefined
 
           logger.debug(`Using generator: ${generator} ${generatorFlags} for ${os} ${arch}`)
           return {

src/vcvarsall.ts

@@ -153,7 +153,11 @@ export function setupMSVCDevCmd(arch: string, vsversion?: string) {
   if (process.platform !== "win32") {
     return
   }
-  const msvcArch = getMsvcArch(arch)
+  const hostArch = getMsvcArch(process.arch)
+  const targetArch = getMsvcArch(arch)
+  const msvcArch = hostArch === targetArch ? targetArch : `${hostArch}_${targetArch}`
+  logger.debug(`Setting up MSVC for ${msvcArch}`)
+  console.group()
 
   // Add standard location of "vswhere" to PATH, in case it's not there.
   process.env.PATH += delimiter + VSWHERE_PATH
@@ -221,4 +225,5 @@ export function setupMSVCDevCmd(arch: string, vsversion?: string) {
       process.env[name] = new_value
     }
   }
+  console.groupEnd()
 }