From 3f1343922271ffd388eb147bed2cae8e543f4013 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 17 Aug 2025 23:26:22 +0200 Subject: [PATCH] fixup --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d5f4c4317b..ab5eb8625d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -849,7 +849,7 @@ jobs: /usr/bin/find '/c/Program Files (x86)/Windows Kits/10' \( -name '*.exe' -o -name '*.h' -o -name '*.lib' \) echo '-----------------------------------------' MSVC_ROOTD="$(cygpath --dos "$PROGRAMFILES/Microsoft Visual Studio")" # to avoid spaces - MSVC_ROOTU="$(/usr/bin/find "$(cygpath --unix "$MSVC_ROOTD/2022/Enterprise/vc/tools/msvc")" -mindepth 1 -maxdepth 1 -type d | sort | tail -n 1)" + MSVC_ROOTU="$(/usr/bin/find "$(cygpath --unix "$MSVC_ROOTD/2022/Enterprise/vc/tools/msvc")" -mindepth 1 -maxdepth 1 -type d -name '*.*' | sort | tail -n 1)" MSVC_ROOTW="$(cygpath --windows "$MSVC_ROOTU")" MSVC_ROOTU="$(cygpath --unix "$MSVC_ROOTW")" echo "MSVC_ROOTW:|$MSVC_ROOTW|" @@ -858,7 +858,7 @@ jobs: echo "MSVC_BINU:|$MSVC_BINU|" MSDK_ROOTW="$(cygpath --dos "$(printenv 'ProgramFiles(x86)')/Windows Kits")/10" MSDK_ROOTU="$(cygpath --unix "$MSDK_ROOTW")" - MSDK_VER="$(basename "$(/usr/bin/find "$MSDK_ROOTU/lib" -mindepth 1 -maxdepth 1 -type d | sort | tail -n 1)")" + MSDK_VER="$(basename "$(/usr/bin/find "$MSDK_ROOTU/lib" -mindepth 1 -maxdepth 1 -type d -name '*.*' | sort | tail -n 1)")" echo "MSDK_VER:|$MSDK_VER|" MSDK_LIBW="$MSDK_ROOTW/lib/$MSDK_VER" MSDK_INCU="$MSDK_ROOTU/include/$MSDK_VER"