Fix CMAKE config for PCSC in order to avoid msys DLL dependencies
merge of PR #3886
This commit is contained in:
parent
bdf5a3ad3f
commit
f17383afc2
|
@ -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)
|
||||||
|
|
Loading…
Reference in New Issue