From b50014071e37be0d6eb10c49b88144f44441f342 Mon Sep 17 00:00:00 2001
From: cslashm <cslashm@gmail.com>
Date: Thu, 31 May 2018 10:36:12 +0200
Subject: [PATCH] Fix CMAKE config for PCSC in order to avoid msys DLL
 dependencies

---
 cmake/FindPCSC.cmake | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/cmake/FindPCSC.cmake b/cmake/FindPCSC.cmake
index 8332abc49..b5e8420e6 100644
--- a/cmake/FindPCSC.cmake
+++ b/cmake/FindPCSC.cmake
@@ -14,28 +14,31 @@ ENDIF (PCSC_INCLUDE_DIR AND PCSC_LIBRARIES)
 IF (NOT WIN32)
   FIND_PACKAGE(PkgConfig)
   PKG_CHECK_MODULES(PC_PCSC libpcsclite)
+
+  FIND_PATH(PCSC_INCLUDE_DIR winscard.h
+    HINTS
+    /usr/include/PCSC
+    ${PC_PCSC_INCLUDEDIR}
+    ${PC_PCSC_INCLUDE_DIRS}
+    PATH_SUFFIXES PCSC
+  )
+
+  FIND_LIBRARY(PCSC_LIBRARY NAMES pcsclite libpcsclite PCSC
+    HINTS
+    ${PC_PCSC_LIBDIR}
+    ${PC_PCSC_LIBRARY_DIRS}
+  )
+
+ELSE (NOT WIN32)
+  IF(BUILD_64 STREQUAL "ON")
+    set(PCSC_INCLUDE_DIR /mingw64/x86_64-w64-mingw32/include)
+    set(PCSC_LIBRARY /mingw64/x86_64-w64-mingw32/lib/libwinscard.a)
+  ELSE(BUILD_64 STREQUAL "ON")
+    set(PCSC_INCLUDE_DIR /mingw32/i686-w64-mingw32/include)
+    set(PCSC_LIBRARY /mingw32/i686-w64-mingw32/lib/libwinscard.a)
+  ENDIF(BUILD_64 STREQUAL "ON")
 ENDIF (NOT WIN32)
 
-FIND_PATH(PCSC_INCLUDE_DIR winscard.h
-  HINTS
-  IF (WIN32)
-  ${MSYS2_FOLDER}/mingw64/x86_64-w64-mingw32/include
-  ENDIF (WIN32)
-  /usr/include/PCSC
-  ${PC_PCSC_INCLUDEDIR}
-  ${PC_PCSC_INCLUDE_DIRS}
-  PATH_SUFFIXES PCSC
-  )
-
-FIND_LIBRARY(PCSC_LIBRARY NAMES pcsclite libpcsclite WinSCard PCSC
-  HINTS
-  IF (WIN32)
-  ${MSYS2_FOLDER}/mingw64/x86_64-w64-mingw32/lib
-  ENDIF (WIN32)
-  ${PC_PCSC_LIBDIR}
-  ${PC_PCSC_LIBRARY_DIRS}
-  )
-
 # handle the QUIETLY and REQUIRED arguments and set PCSC_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)