From b24191a9b9f6fa33fbb2a0e3be9c9b12aae80e55 Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Tue, 4 Oct 2011 21:43:05 +0000 Subject: [PATCH] Fix compilation using cmake --- libnfc/CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libnfc/CMakeLists.txt b/libnfc/CMakeLists.txt index 7ade8ca..7f636f1 100644 --- a/libnfc/CMakeLists.txt +++ b/libnfc/CMakeLists.txt @@ -14,28 +14,28 @@ ENDIF(LIBNFC_SERIAL_AUTOPROBE_ENABLED) INCLUDE(LibnfcDrivers) -IF(PCSC_INCLUDE_DIRS) +IF(PCSC_FOUND) INCLUDE_DIRECTORIES(${PCSC_INCLUDE_DIRS}) LINK_DIRECTORIES(${PCSC_LIBRARY_DIRS}) -ENDIF(PCSC_INCLUDE_DIRS) +ENDIF(PCSC_FOUND) -IF(LIBUSB_INCLUDE_DIRS) +IF(LIBUSB_FOUND) INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS}) LINK_DIRECTORIES(${LIBUSB_LIBRARY_DIRS}) -ENDIF(LIBUSB_INCLUDE_DIRS) +ENDIF(LIBUSB_FOUND) # Library -SET(LIBRARY_SOURCES nfc nfc-device nfc-emulation iso14443-subr mirror-subr ${DRIVERS_SOURCES} ${BUSES_SOURCES} ${CHIPS_SOURCES}) +SET(LIBRARY_SOURCES nfc nfc-device nfc-emulation nfc-internal iso14443-subr mirror-subr ${DRIVERS_SOURCES} ${BUSES_SOURCES} ${CHIPS_SOURCES}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) ADD_LIBRARY(nfc SHARED ${LIBRARY_SOURCES}) -IF(PCSC_INCLUDE_DIRS) +IF(PCSC_FOUND) TARGET_LINK_LIBRARIES(nfc ${PCSC_LIBRARIES}) -ENDIF(PCSC_INCLUDE_DIRS) +ENDIF(PCSC_FOUND) -IF(LIBUSB_INCLUDE_DIRS) +IF(LIBUSB_FOUND) TARGET_LINK_LIBRARIES(nfc ${LIBUSB_LIBRARIES}) -ENDIF(LIBUSB_INCLUDE_DIRS) +ENDIF(LIBUSB_FOUND) IF(WIN32) TARGET_LINK_LIBRARIES(nfc wsock32)