From 36a4eb208f131f38bcc6c206527d700a9b5a62df Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Mon, 7 Sep 2009 08:44:24 +0000 Subject: [PATCH] CMake: Make disable serial probe configurable in GUI. CMake: Add sources of getopt tools to all builds except windows. (Thanks to Fkooman) --- CMakeLists.txt | 1 + src/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6368886..4f8e258 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ SET(VERSION "1.2.2") SET(LIBNFC_VERBOSE_OUTPUT OFF CACHE BOOL "Verbose output of communication with the NFC chip") SET(LIBNFC_LANG_C99 OFF CACHE BOOL "Use C99 language standard (GCC only)") SET(LIBNFC_PCSC ON CACHE BOOL "Enable PC/SC support") +SET(LIBNFC_DISABLE_SERIAL_AUTOPROBE OFF CACHE BOOL "Disable serial autoprobe") # Set some pkg-config variables SET(prefix ${CMAKE_INSTALL_PREFIX}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ea17dc5..079f871 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,11 @@ SET(LIBRARY-SOURCES libnfc dev_pn531 dev_pn533 rs232 bitutils dev_arygon) SET(TOOLS-SOURCES list mftool mfultool initiator target) +# disabled for now on Windows, due to lacking getopt +IF(NOT MSVC) + SET(TOOLS-SOURCES ${TOOLS-SOURCES} anticol emulate relay) +ENDIF(NOT MSVC) + IF(LIBNFC_PCSC) ADD_DEFINITIONS("-DHAVE_PCSC_LITE=1") SET(LIBRARY-SOURCES ${LIBRARY-SOURCES} "dev_acr122")