Drop workaround for FindFirstFileExA issue with CMake pre-3.26.3

weliveindetail · weliveindetail · commit 6ca7ed6f561c · 2024-12-04T16:18:44.000+01:00
diff --git a/utils/build.ps1 b/utils/build.ps1
@@ -1091,11 +1091,6 @@ function Build-CMakeProject {
       }
       TryAdd-KeyValue $Defines CMAKE_C_COMPILER_TARGET $Arch.LLVMTarget
 
-      if (-not (Test-CMakeAtLeast -Major 3 -Minor 26 -Patch 3) -and $Platform -eq [Platform]::Windows) {
-        # Workaround for https://github.com/ninja-build/ninja/issues/2280
-        TryAdd-KeyValue $Defines CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: "
-      }
-
       if ($DebugInfo -and $CDebugFormat -eq "dwarf") {
         Append-FlagsDefine $Defines CMAKE_C_FLAGS "-gdwarf"
       }
@@ -1110,11 +1105,6 @@ function Build-CMakeProject {
       }
       TryAdd-KeyValue $Defines CMAKE_CXX_COMPILER_TARGET $Arch.LLVMTarget
 
-      if (-not (Test-CMakeAtLeast -Major 3 -Minor 26 -Patch 3) -and $Platform -eq [Platform]::Windows) {
-        # Workaround for https://github.com/ninja-build/ninja/issues/2280
-        TryAdd-KeyValue $Defines CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: "
-      }
-
       if ($DebugInfo -and $CDebugFormat -eq "dwarf") {
         Append-FlagsDefine $Defines CMAKE_CXX_FLAGS "-gdwarf"
       }

Original file line number	Diff line number	Diff line change
`@@ -1091,11 +1091,6 @@ function Build-CMakeProject {`
`1091`	`1091`	`}`
`1092`	`1092`	`TryAdd-KeyValue $Defines CMAKE_C_COMPILER_TARGET $Arch.LLVMTarget`
`1093`	`1093`
`1094`		`- if (-not (Test-CMakeAtLeast -Major 3 -Minor 26 -Patch 3) -and $Platform -eq [Platform]::Windows) {`
`1095`		`- # Workaround for https://github.com/ninja-build/ninja/issues/2280`
`1096`		`- TryAdd-KeyValue $Defines CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: "`
`1097`		`- }`
`1098`		`-`
`1099`	`1094`	`if ($DebugInfo -and $CDebugFormat -eq "dwarf") {`
`1100`	`1095`	`Append-FlagsDefine $Defines CMAKE_C_FLAGS "-gdwarf"`
`1101`	`1096`	`}`
`@@ -1110,11 +1105,6 @@ function Build-CMakeProject {`
`1110`	`1105`	`}`
`1111`	`1106`	`TryAdd-KeyValue $Defines CMAKE_CXX_COMPILER_TARGET $Arch.LLVMTarget`
`1112`	`1107`
`1113`		`- if (-not (Test-CMakeAtLeast -Major 3 -Minor 26 -Patch 3) -and $Platform -eq [Platform]::Windows) {`
`1114`		`- # Workaround for https://github.com/ninja-build/ninja/issues/2280`
`1115`		`- TryAdd-KeyValue $Defines CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: "`
`1116`		`- }`
`1117`		`-`
`1118`	`1108`	`if ($DebugInfo -and $CDebugFormat -eq "dwarf") {`
`1119`	`1109`	`Append-FlagsDefine $Defines CMAKE_CXX_FLAGS "-gdwarf"`
`1120`	`1110`	`}`