Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added driver for contactless PC/SC readers #559

Merged
merged 5 commits into from
Apr 4, 2020
Merged

Added driver for contactless PC/SC readers #559

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75e5e23
Added driver for contactless PC/SC readers
frankmorgner Sep 2, 2019
959a992
added PC/SC driver to cmake
frankmorgner Sep 3, 2019
8e7a8e1
cmake: fixed pcsc requirement for acr122_pcsc
frankmorgner Sep 3, 2019
6f793da
cleanup
frankmorgner Sep 3, 2019
fbae171
Merge branch 'master' into pcsc
AdamLaurie Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cmake: fixed pcsc requirement for acr122_pcsc
  • Loading branch information
@frankmorgner
frankmorgner committed Sep 3, 2019
commit 8e7a8e1b61c72a19e5d0d70ef43a16919bbdf3ca
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ IF(NOT WIN32)
IF(LIBNFC_DRIVER_PCSC)
SET(PKG_REQ ${PKG_REQ} "libpcsclite")
ENDIF(LIBNFC_DRIVER_ACR122)
IF(LIBNFC_DRIVER_ACR122)
IF(LIBNFC_DRIVER_ACR122_PCSC)
SET(PKG_REQ ${PKG_REQ} "libpcsclite")
ENDIF(LIBNFC_DRIVER_ACR122)
ENDIF(LIBNFC_DRIVER_ACR122_PCSC)
# CMake lists are separated by a semi colon, replace with colon
STRING(REPLACE ";" "," PKG_CONFIG_REQUIRES "${PKG_REQ}")
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libnfc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc @ONLY)
Expand Down