diff --git a/build/windows/1_build-deps-msys2.ps1 b/build/windows/1_build-deps-msys2.ps1
index 323ecd5545..73a89f9c13 100644
--- a/build/windows/1_build-deps-msys2.ps1
+++ b/build/windows/1_build-deps-msys2.ps1
@@ -102,7 +102,7 @@ function self_build ([string]$repo, [array]$branch, [array]$patches, [array]$opt
     ## Configure and/or build
     if (-not (Test-Path _build-$env:MSYSTEM_PREFIX\build.ninja -Type Leaf))
       {
-        if (Test-Path meson.build -Type Leaf)
+        if ((Test-Path meson.build -Type Leaf) -and -not (Test-Path CMakeLists.txt -Type Leaf))
           {
             #babl and GEGL already auto install .pdb but we don't know about other eventual deps
             if ("$env:MSYSTEM_PREFIX" -ne 'MINGW32')
@@ -142,11 +142,11 @@ self_build gegl @('build/windows/patches/0001-meson-only-generate-CodeView-.pdb-
 
 if ("$env:MSYSTEM_PREFIX" -ne 'MINGW32')
   {
-    exiv2_version='v0.28.7'
+    $exiv2_version='v0.28.7'
   }
 else
   {
-    exiv2_version='v0.27.7'
+    $exiv2_version='v0.27.7'
   }
 self_build https://github.com/Exiv2/exiv2 "$exiv2_version" @('https://github.com/Exiv2/exiv2/pull/3361.patch') @('-DCMAKE_DLL_NAME_WITH_SOVERSION=ON', '-DEXIV2_BUILD_EXIV2_COMMAND=OFF', '-DEXIV2_ENABLE_VIDEO=OFF')