monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 20:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #3886

Browse source 
4602c267 Fix CMAKE config for PCSC in order to avoid msys DLL dependencies (cslashm)
This commit is contained in:
Riccardo Spagni 2018-05-31 21:24:17 +02:00
commit dca353c574
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
cmake/FindPCSC.cmake
View file

@ -14,28 +14,31 @@ ENDIF (PCSC_INCLUDE_DIR AND PCSC_LIBRARIES)
IF (NOT WIN32) IF (NOT WIN32)
FIND_PACKAGE(PkgConfig) FIND_PACKAGE(PkgConfig)
PKG_CHECK_MODULES(PC_PCSC libpcsclite) PKG_CHECK_MODULES(PC_PCSC libpcsclite)
ENDIF (NOT WIN32)
FIND_PATH(PCSC_INCLUDE_DIR winscard.h FIND_PATH(PCSC_INCLUDE_DIR winscard.h
HINTS HINTS
IF (WIN32)
${MSYS2_FOLDER}/mingw64/x86_64-w64-mingw32/include
ENDIF (WIN32)
/usr/include/PCSC /usr/include/PCSC
${PC_PCSC_INCLUDEDIR} ${PC_PCSC_INCLUDEDIR}
${PC_PCSC_INCLUDE_DIRS} ${PC_PCSC_INCLUDE_DIRS}
PATH_SUFFIXES PCSC PATH_SUFFIXES PCSC
) )
FIND_LIBRARY(PCSC_LIBRARY NAMES pcsclite libpcsclite WinSCard PCSC FIND_LIBRARY(PCSC_LIBRARY NAMES pcsclite libpcsclite PCSC
HINTS HINTS
IF (WIN32)
${MSYS2_FOLDER}/mingw64/x86_64-w64-mingw32/lib
ENDIF (WIN32)
${PC_PCSC_LIBDIR} ${PC_PCSC_LIBDIR}
${PC_PCSC_LIBRARY_DIRS} ${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 # handle the QUIETLY and REQUIRED arguments and set PCSC_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)