From 3d608b13caa6325f849e887a3487c739aedbd0d0 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Fri, 27 Oct 2023 12:08:17 +0300
Subject: [PATCH] Merge libpcsc-cpp and libpcsc-mock repositories

WE2-828

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 .github/workflows/cmake-windows.yml | 4 ++--
 lib/libelectronic-id                | 2 +-
 src/mac/js                          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cmake-windows.yml b/.github/workflows/cmake-windows.yml
index 18e6251a..e5eae30a 100644
--- a/.github/workflows/cmake-windows.yml
+++ b/.github/workflows/cmake-windows.yml
@@ -36,9 +36,9 @@ jobs:
 
       - name: Configure
         run: |
-          cmake "-GNinja" `
+          cmake "-GNinja" -S . -B build `
             "-DCMAKE_TOOLCHAIN_FILE=${env:VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" `
-            "-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}" -S . -B build
+            "-DCMAKE_BUILD_TYPE=${env:BUILD_TYPE}"
 
       - name: Build
         run: |
diff --git a/lib/libelectronic-id b/lib/libelectronic-id
index 28a157e6..4d935f1e 160000
--- a/lib/libelectronic-id
+++ b/lib/libelectronic-id
@@ -1 +1 @@
-Subproject commit 28a157e62812e168c7d452ebe30d82d196aca579
+Subproject commit 4d935f1ea6bacf2f3a13c3d8eb759be39ca2e4c0
diff --git a/src/mac/js b/src/mac/js
index 351a0cb4..c612cd74 160000
--- a/src/mac/js
+++ b/src/mac/js
@@ -1 +1 @@
-Subproject commit 351a0cb491bd8ef9506ac85a6fe4742fb45b3fb1
+Subproject commit c612cd7473f4e535191f4b9912c6c024704b5189