diff options
| author | cslashm <cslashm@gmail.com> | 2018-05-31 15:30:16 +0200 |
|---|---|---|
| committer | cslashm <cslashm@gmail.com> | 2018-05-31 15:30:16 +0200 |
| commit | f17383afc2cd3854cc2071bcc801dd912efc1212 (patch) | |
| tree | 8bfe47211492716d97ef2b396a02efdab391d7c8 | |
| parent | Fix PCSC compilation under windows (diff) | |
| download | monero-f17383afc2cd3854cc2071bcc801dd912efc1212.tar.xz | |
Fix CMAKE config for PCSC in order to avoid msys DLL dependencies
merge of PR #3886
| -rw-r--r-- | cmake/FindPCSC.cmake | 37 |
1 files changed, 20 insertions, 17 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) -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_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 WinSCard PCSC - HINTS - IF (WIN32) - ${MSYS2_FOLDER}/mingw64/x86_64-w64-mingw32/lib - ENDIF (WIN32) - ${PC_PCSC_LIBDIR} - ${PC_PCSC_LIBRARY_DIRS} + 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) + # handle the QUIETLY and REQUIRED arguments and set PCSC_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) |