From d9cc7b9c96de2c27276146f691c526fb5573debb Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Sun, 6 Sep 2026 18:05:34 +0000
Subject: [PATCH 1/3] ci: Windows Ninja build fix and MSVC updates

---
 .github/workflows/build.yml | 12 +++---------
 CMakeLists.txt              |  6 +++++-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a34e506b60..b89eacd31d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,20 +48,14 @@ jobs:
     - name: install ninja (win)
       run: choco install ninja
       if: matrix.os == 'windows-latest'
-    - name: mkdir
-      run: mkdir -p out
+    - uses: ilammy/msvc-dev-cmd@v1
+      if: matrix.os == 'windows-latest'
     - name: tool versions
       run: |
         cmake --version
         ninja --version
     - name: cmake
-      run: cmake .. -G Ninja -DWERROR=ON -Werror=dev -DCMAKE_ERROR_DEPRECATED=OFF
-      working-directory: out
-      if: matrix.os != 'windows-latest'
-    - name: cmake (windows)
-      run: cmake .. -DWERROR=ON -Werror=dev -DCMAKE_ERROR_DEPRECATED=OFF
-      working-directory: out
-      if: matrix.os == 'windows-latest'
+      run: cmake -S . -B out -G Ninja -DWERROR=ON -Werror=dev -DCMAKE_ERROR_DEPRECATED=OFF
     - name: build
       run: cmake --build out
     - name: check if generated files are up-to-date
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c53f354ed..dc2e61574f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -650,7 +650,11 @@ endif ()
 
 if (BUILD_TESTS)
   if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(WASM2C_CFLAGS "${WASM2C_CFLAGS} -g -O0")
+    if (COMPILER_IS_MSVC)
+      set(WASM2C_CFLAGS "${WASM2C_CFLAGS} /Zi /Od /FS")
+    else ()
+      set(WASM2C_CFLAGS "${WASM2C_CFLAGS} -g -O0")
+    endif ()
   endif ()
 
   if (WABT_BIG_ENDIAN)

From bec62924a03e1c60cc19c15e314af10589983b5c Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Mon, 14 Sep 2026 23:17:17 +0000
Subject: [PATCH 2/3] ci: keep Visual Studio generator on Windows, remove
 unused ninja install, use -S . -B out

---
 .github/workflows/build.yml | 16 ++++++++--------
 CMakeLists.txt              |  6 +-----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 41c7a508ed..d208a8a8c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,17 +45,17 @@ jobs:
     - name: install ninja (osx)
       run: brew install ninja
       if: matrix.os == 'macos-latest'
-    - name: install ninja (win)
-      run: choco install ninja
-      if: matrix.os == 'windows-latest'
-    - uses: ilammy/msvc-dev-cmd@v1
-      if: matrix.os == 'windows-latest'
     - name: tool versions
-      run: |
-        cmake --version
-        ninja --version
+      run: cmake --version
+    - name: ninja version
+      run: ninja --version
+      if: matrix.os != 'windows-latest'
     - name: cmake
       run: cmake -S . -B out -G Ninja -DWERROR=ON -Werror=dev -DCMAKE_ERROR_DEPRECATED=OFF
+      if: matrix.os != 'windows-latest'
+    - name: cmake (windows)
+      run: cmake -S . -B out -DWERROR=ON -Werror=dev -DCMAKE_ERROR_DEPRECATED=OFF
+      if: matrix.os == 'windows-latest'
     - name: build
       run: cmake --build out
     - name: check if generated files are up-to-date
diff --git a/CMakeLists.txt b/CMakeLists.txt
index caed90848c..e0180d04e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -650,11 +650,7 @@ endif ()
 
 if (BUILD_TESTS)
   if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    if (COMPILER_IS_MSVC)
-      set(WASM2C_CFLAGS "${WASM2C_CFLAGS} /Zi /Od /FS")
-    else ()
-      set(WASM2C_CFLAGS "${WASM2C_CFLAGS} -g -O0")
-    endif ()
+    set(WASM2C_CFLAGS "${WASM2C_CFLAGS} -g -O0")
   endif ()
 
   if (WABT_BIG_ENDIAN)

From 4d9f22fc88be272c85147d5ffccd0b3617026ed7 Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevmoo@google.com>
Date: Tue, 15 Sep 2026 17:30:44 +0000
Subject: [PATCH 3/3] ci: rename tool versions step to cmake version

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d208a8a8c1..b27a170526 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
     - name: install ninja (osx)
       run: brew install ninja
       if: matrix.os == 'macos-latest'
-    - name: tool versions
+    - name: cmake version
       run: cmake --version
     - name: ninja version
       run: ninja --version