From 480497ca346f6d5447ca6f5badf61a75e767fd11 Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Sun, 3 Dec 2023 16:24:24 +1100
Subject: [PATCH] fold tests for additional DLLs into main loop

easier and more compact to test presence of DLLs in both
%PREFIX% and %LIBRARY_BIN%, also for those added in 2019/2022.
---
 recipe/meta.yaml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 413ff6d..642e9e5 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -125,18 +125,17 @@ outputs:
             'vcamp140.dll',
             'vccorlib140.dll',
             'vcomp140.dll',
-            'vcruntime140.dll'] %}
+            'vcruntime140.dll',
+        ] + (vsyear | int >= 2019) * [
+            'msvcp140_atomic_wait.dll',
+            'msvcp140_codecvt_ids.dll',
+            'vcruntime140_1.dll',
+        ] + (vsyear | int >= 2022) * [
+            'vcruntime140_threads.dll',
+        ]%}
         - if not exist %LIBRARY_BIN%\{{ dllname }} exit 1
         - if not exist %PREFIX%\{{ dllname }} exit 1
         {% endfor %}
-        {% if vsyear | int >= 2019 %}
-        - if not exist %LIBRARY_BIN%\vcruntime140_1.dll exit 1
-        - if not exist %LIBRARY_BIN%\msvcp140_atomic_wait.dll exit 1
-        - if not exist %LIBRARY_BIN%\msvcp140_codecvt_ids.dll exit 1
-        {% endif %}
-        {% if vsyear | int >= 2022 %}
-        - if not exist %LIBRARY_BIN%\vcruntime140_threads.dll exit 1
-        {% endif %}
 
   - name: vs{{ runtime_year }}_runtime
     version: {{ runtime_version }}