build.ps1: Fix cmake.exe version checks when not in %Path% (#585)

Author: tristanlabelle

build.ps1

@@ -367,116 +367,118 @@ function Build-CMakeProject {
 
   $Stopwatch = [Diagnostics.Stopwatch]::StartNew()
 
-  # Add additional defines (unless already present)
-  $Defines = $Defines.Clone()
-  TryAdd-KeyValue $Defines CMAKE_BUILD_TYPE $BuildType
-  TryAdd-KeyValue $Defines CMAKE_MT "mt"
-
-  $GenerateDebugInfo = $Defines["CMAKE_BUILD_TYPE"] -ne "Release"
-  $Zi = if ($GenerateDebugInfo) { "/Zi" } else { "" }
-
-  $CFlags = "/GS- /Gw /Gy /Oi /Oy $Zi /Zc:inline"
-  $CXXFlags = "/GS- /Gw /Gy /Oi /Oy $Zi /Zc:inline /Zc:__cplusplus"
-  if ($UseMSVCCompilers.Contains("C")) {
-    TryAdd-KeyValue $Defines CMAKE_C_COMPILER cl
-    Append-FlagsDefine $Defines CMAKE_C_FLAGS $CFlags
-  }
-  if ($UseMSVCCompilers.Contains("CXX")) {
-    TryAdd-KeyValue $Defines CMAKE_CXX_COMPILER cl
-    Append-FlagsDefine $Defines CMAKE_CXX_FLAGS $CXXFlags
-  }
-  if ($UseBuiltCompilers.Contains("ASM")) {
-    TryAdd-KeyValue $Defines CMAKE_ASM_COMPILER "$BinaryCache\1\bin\clang-cl.exe"
-    Append-FlagsDefine $Defines CMAKE_ASM_FLAGS "--target=$($Arch.LLVMTarget)"
-    TryAdd-KeyValue $Defines CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL "/MD"
-  }
-  if ($UseBuiltCompilers.Contains("C")) {
-    TryAdd-KeyValue $Defines CMAKE_C_COMPILER "$BinaryCache\1\bin\clang-cl.exe"
-    TryAdd-KeyValue $Defines CMAKE_C_COMPILER_TARGET $Arch.LLVMTarget
+  # Enter the developer command shell early so we can resolve cmake.exe
+  # for version checks.
+  Isolate-EnvVars {
+    Invoke-VsDevShell $Arch
 
-    if (-not (Test-CMakeAtLeast -Major 3 -Minor 26 -Patch 3)) {
-      # Workaround for https://github.com/ninja-build/ninja/issues/2280
-      TryAdd-KeyValue $Defines CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: "
-    }
+    # Add additional defines (unless already present)
+    $Defines = $Defines.Clone()
+    TryAdd-KeyValue $Defines CMAKE_BUILD_TYPE $BuildType
+    TryAdd-KeyValue $Defines CMAKE_MT "mt"
 
-    if ($GenerateDebugInfo -and $CDebugFormat -eq "dwarf") {
-      Append-FlagsDefine $Defines CMAKE_C_FLAGS -gdwarf
-    }
-    Append-FlagsDefine $Defines CMAKE_C_FLAGS $CFlags
-  }
-  if ($UseBuiltCompilers.Contains("CXX")) {
-    TryAdd-KeyValue $Defines CMAKE_CXX_COMPILER "$BinaryCache\1\bin\clang-cl.exe"
-    TryAdd-KeyValue $Defines CMAKE_CXX_COMPILER_TARGET $Arch.LLVMTarget
+    $GenerateDebugInfo = $Defines["CMAKE_BUILD_TYPE"] -ne "Release"
+    $Zi = if ($GenerateDebugInfo) { "/Zi" } else { "" }
 
-    if (-not (Test-CMakeAtLeast -Major 3 -Minor 26 -Patch 3)) {
-      # Workaround for https://github.com/ninja-build/ninja/issues/2280
-      TryAdd-KeyValue $Defines CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: "
+    $CFlags = "/GS- /Gw /Gy /Oi /Oy $Zi /Zc:inline"
+    $CXXFlags = "/GS- /Gw /Gy /Oi /Oy $Zi /Zc:inline /Zc:__cplusplus"
+    if ($UseMSVCCompilers.Contains("C")) {
+      TryAdd-KeyValue $Defines CMAKE_C_COMPILER cl
+      Append-FlagsDefine $Defines CMAKE_C_FLAGS $CFlags
     }
-
-    if ($GenerateDebugInfo -and $CDebugFormat -eq "dwarf") {
-      Append-FlagsDefine $Defines CMAKE_CXX_FLAGS -gdwarf
+    if ($UseMSVCCompilers.Contains("CXX")) {
+      TryAdd-KeyValue $Defines CMAKE_CXX_COMPILER cl
+      Append-FlagsDefine $Defines CMAKE_CXX_FLAGS $CXXFlags
     }
-    Append-FlagsDefine $Defines CMAKE_CXX_FLAGS $CXXFlags
-  }
-  if ($UseBuiltCompilers.Contains("Swift")) {
-    TryAdd-KeyValue $Defines CMAKE_Swift_COMPILER "$BinaryCache\1\bin\swiftc.exe"
-    TryAdd-KeyValue $Defines CMAKE_Swift_COMPILER_TARGET $Arch.LLVMTarget
+    if ($UseBuiltCompilers.Contains("ASM")) {
+      TryAdd-KeyValue $Defines CMAKE_ASM_COMPILER "$BinaryCache\1\bin\clang-cl.exe"
+      Append-FlagsDefine $Defines CMAKE_ASM_FLAGS "--target=$($Arch.LLVMTarget)"
+      TryAdd-KeyValue $Defines CMAKE_ASM_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreadedDLL "/MD"
+    }
+    if ($UseBuiltCompilers.Contains("C")) {
+      TryAdd-KeyValue $Defines CMAKE_C_COMPILER "$BinaryCache\1\bin\clang-cl.exe"
+      TryAdd-KeyValue $Defines CMAKE_C_COMPILER_TARGET $Arch.LLVMTarget
 
-    $RuntimeBuildDir = Get-ProjectBuildDir $Arch 1
-    $SwiftResourceDir = "${RuntimeBuildDir}\lib\swift"
+      if (-not (Test-CMakeAtLeast -Major 3 -Minor 26 -Patch 3)) {
+        # Workaround for https://github.com/ninja-build/ninja/issues/2280
+        TryAdd-KeyValue $Defines CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: "
+      }
 
-    $SwiftArgs = [System.Collections.ArrayList]@()
+      if ($GenerateDebugInfo -and $CDebugFormat -eq "dwarf") {
+        Append-FlagsDefine $Defines CMAKE_C_FLAGS -gdwarf
+      }
+      Append-FlagsDefine $Defines CMAKE_C_FLAGS $CFlags
+    }
+    if ($UseBuiltCompilers.Contains("CXX")) {
+      TryAdd-KeyValue $Defines CMAKE_CXX_COMPILER "$BinaryCache\1\bin\clang-cl.exe"
+      TryAdd-KeyValue $Defines CMAKE_CXX_COMPILER_TARGET $Arch.LLVMTarget
 
-    if ($SwiftSDK -ne "") {
-      $SwiftArgs.Add("-sdk $SwiftSDK") | Out-Null
-    } else {
-      $SwiftArgs.Add("-resource-dir $SwiftResourceDir") | Out-Null
-      $SwiftArgs.Add("-L $SwiftResourceDir\windows") | Out-Null
-      $SwiftArgs.Add("-vfsoverlay $RuntimeBuildDir\stdlib\windows-vfs-overlay.yaml") | Out-Null
+      if (-not (Test-CMakeAtLeast -Major 3 -Minor 26 -Patch 3)) {
+        # Workaround for https://github.com/ninja-build/ninja/issues/2280
+        TryAdd-KeyValue $Defines CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: "
+      }
+
+      if ($GenerateDebugInfo -and $CDebugFormat -eq "dwarf") {
+        Append-FlagsDefine $Defines CMAKE_CXX_FLAGS -gdwarf
+      }
+      Append-FlagsDefine $Defines CMAKE_CXX_FLAGS $CXXFlags
     }
+    if ($UseBuiltCompilers.Contains("Swift")) {
+      TryAdd-KeyValue $Defines CMAKE_Swift_COMPILER "$BinaryCache\1\bin\swiftc.exe"
+      TryAdd-KeyValue $Defines CMAKE_Swift_COMPILER_TARGET $Arch.LLVMTarget
 
-    # Debug Information
-    if ($GenerateDebugInfo) {
-      if ($SwiftDebugFormat -eq "dwarf") {
-        $SwiftArgs.Add("-g -Xlinker /DEBUG:DWARF -use-ld=lld-link") | Out-Null
+      $RuntimeBuildDir = Get-ProjectBuildDir $Arch 1
+      $SwiftResourceDir = "${RuntimeBuildDir}\lib\swift"
+
+      $SwiftArgs = [System.Collections.ArrayList]@()
+
+      if ($SwiftSDK -ne "") {
+        $SwiftArgs.Add("-sdk $SwiftSDK") | Out-Null
       } else {
-        $SwiftArgs.Add("-g -debug-info-format=codeview -Xlinker -debug") | Out-Null
+        $SwiftArgs.Add("-resource-dir $SwiftResourceDir") | Out-Null
+        $SwiftArgs.Add("-L $SwiftResourceDir\windows") | Out-Null
+        $SwiftArgs.Add("-vfsoverlay $RuntimeBuildDir\stdlib\windows-vfs-overlay.yaml") | Out-Null
       }
-    } else {
-      $SwiftArgs.Add("-gnone") | Out-Null
-    }
-    $SwiftArgs.Add("-Xlinker /INCREMENTAL:NO") | Out-Null
 
-    # Swift Requries COMDAT folding and de-duplication
-    $SwiftArgs.Add("-Xlinker /OPT:REF") | Out-Null
-    $SwiftArgs.Add("-Xlinker /OPT:ICF") | Out-Null
+      # Debug Information
+      if ($GenerateDebugInfo) {
+        if ($SwiftDebugFormat -eq "dwarf") {
+          $SwiftArgs.Add("-g -Xlinker /DEBUG:DWARF -use-ld=lld-link") | Out-Null
+        } else {
+          $SwiftArgs.Add("-g -debug-info-format=codeview -Xlinker -debug") | Out-Null
+        }
+      } else {
+        $SwiftArgs.Add("-gnone") | Out-Null
+      }
+      $SwiftArgs.Add("-Xlinker /INCREMENTAL:NO") | Out-Null
 
-    $SwiftcFlags = $SwiftArgs.ToArray() -Join " "
-    Append-FlagsDefine $Defines CMAKE_Swift_FLAGS $SwiftcFlags
+      # Swift Requries COMDAT folding and de-duplication
+      $SwiftArgs.Add("-Xlinker /OPT:REF") | Out-Null
+      $SwiftArgs.Add("-Xlinker /OPT:ICF") | Out-Null
 
-    # Workaround CMake 3.26+ enabling `-wmo` by default on release builds
-    Append-FlagsDefine $Defines CMAKE_Swift_FLAGS_RELEASE "-O"
-    Append-FlagsDefine $Defines CMAKE_Swift_FLAGS_RELWITHDEBINFO "-O"
-  }
-  if ("" -ne $InstallTo) {
-    TryAdd-KeyValue $Defines CMAKE_INSTALL_PREFIX $InstallTo
-  }
+      $SwiftcFlags = $SwiftArgs.ToArray() -Join " "
+      Append-FlagsDefine $Defines CMAKE_Swift_FLAGS $SwiftcFlags
 
-  # Generate the project
-  $cmakeGenerateArgs = @("-B", $Bin, "-S", $Src, "-G", $Generator)
-  if ("" -ne $CacheScript) {
-    $cmakeGenerateArgs += @("-C", $CacheScript)
-  }
-  foreach ($Define in ($Defines.GetEnumerator() | Sort-Object Name)) {
-    # Avoid backslashes in defines since they are going into CMakeCache.txt,
-    # where they are interpreted as escapes. Assume all backslashes
-    # are path separators and can be turned into forward slashes.
-    $ValueWithForwardSlashes = $Define.Value.Replace("\", "/")
-    $cmakeGenerateArgs += @("-D", "$($Define.Key)=$ValueWithForwardSlashes")
-  }
+      # Workaround CMake 3.26+ enabling `-wmo` by default on release builds
+      Append-FlagsDefine $Defines CMAKE_Swift_FLAGS_RELEASE "-O"
+      Append-FlagsDefine $Defines CMAKE_Swift_FLAGS_RELWITHDEBINFO "-O"
+    }
+    if ("" -ne $InstallTo) {
+      TryAdd-KeyValue $Defines CMAKE_INSTALL_PREFIX $InstallTo
+    }
 
-  Isolate-EnvVars {
-    Invoke-VsDevShell $Arch
+    # Generate the project
+    $cmakeGenerateArgs = @("-B", $Bin, "-S", $Src, "-G", $Generator)
+    if ("" -ne $CacheScript) {
+      $cmakeGenerateArgs += @("-C", $CacheScript)
+    }
+    foreach ($Define in ($Defines.GetEnumerator() | Sort-Object Name)) {
+      # Avoid backslashes in defines since they are going into CMakeCache.txt,
+      # where they are interpreted as escapes. Assume all backslashes
+      # are path separators and can be turned into forward slashes.
+      $ValueWithForwardSlashes = $Define.Value.Replace("\", "/")
+      $cmakeGenerateArgs += @("-D", "$($Define.Key)=$ValueWithForwardSlashes")
+    }
 
     Invoke-Program cmake.exe @cmakeGenerateArgs