From f56bbabf6cb202ce7b7f14c596ba8a56b8ec1f9c Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 8 Jul 2020 13:06:45 +0200 Subject: [PATCH] easy reading condition --- cmake/modules/LibnfcDrivers.cmake | 10 +++++----- libnfc/CMakeLists.txt | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cmake/modules/LibnfcDrivers.cmake b/cmake/modules/LibnfcDrivers.cmake index 23c322a..7dc2503 100644 --- a/cmake/modules/LibnfcDrivers.cmake +++ b/cmake/modules/LibnfcDrivers.cmake @@ -3,13 +3,13 @@ SET(LIBNFC_DRIVER_ACR122_PCSC OFF CACHE BOOL "Enable ACR122 support (Depends on SET(LIBNFC_DRIVER_ACR122_USB ON CACHE BOOL "Enable ACR122 support (Direct USB connection)") SET(LIBNFC_DRIVER_ACR122S ON CACHE BOOL "Enable ACR122S support (Use serial port)") SET(LIBNFC_DRIVER_ARYGON ON CACHE BOOL "Enable ARYGON support (Use serial port)") -IF(NOT UNIX OR APPLE) - SET(LIBNFC_DRIVER_PN532_I2C OFF CACHE BOOL "Enable PN532 I2C support (Use I2C bus)") - SET(LIBNFC_DRIVER_PN532_SPI OFF CACHE BOOL "Enable PN532 SPI support (Use SPI bus)") -ELSE(NOT UNIX OR APPLE) +IF(UNIX AND NOT APPLE) SET(LIBNFC_DRIVER_PN532_I2C ON CACHE BOOL "Enable PN532 I2C support (Use I2C bus)") SET(LIBNFC_DRIVER_PN532_SPI ON CACHE BOOL "Enable PN532 SPI support (Use SPI bus)") -ENDIF(NOT UNIX OR APPLE) +ELSE(UNIX AND NOT APPLE) + SET(LIBNFC_DRIVER_PN532_I2C OFF CACHE BOOL "Enable PN532 I2C support (Use I2C bus)") + SET(LIBNFC_DRIVER_PN532_SPI OFF CACHE BOOL "Enable PN532 SPI support (Use SPI bus)") +ENDIF(UNIX AND NOT APPLE) SET(LIBNFC_DRIVER_PN532_UART ON CACHE BOOL "Enable PN532 UART support (Use serial port)") SET(LIBNFC_DRIVER_PN53X_USB ON CACHE BOOL "Enable PN531 and PN531 USB support (Depends on libusb)") diff --git a/libnfc/CMakeLists.txt b/libnfc/CMakeLists.txt index 3a58a05..2867d4e 100644 --- a/libnfc/CMakeLists.txt +++ b/libnfc/CMakeLists.txt @@ -29,23 +29,23 @@ IF(UART_REQUIRED) ENDIF(UART_REQUIRED) IF(I2C_REQUIRED) - IF(NOT UNIX OR APPLE) + IF(UNIX AND NOT APPLE) + LIST(APPEND BUSES_SOURCES buses/i2c) + ELSE(UNIX AND NOT APPLE) # Only Linux is supported at the moment #LIST(APPEND BUSES_SOURCES ../contrib/win32/libnfc/buses/i2c) MESSAGE( FATAL_ERROR "I2C is only (yet) supported in Linux!" ) - ELSE(NOT UNIX OR APPLE) - LIST(APPEND BUSES_SOURCES buses/i2c) - ENDIF(NOT UNIX OR APPLE) + ENDIF(UNIX AND NOT APPLE) ENDIF(I2C_REQUIRED) IF(SPI_REQUIRED) - IF(NOT UNIX OR APPLE) + IF(UNIX AND NOT APPLE) + LIST(APPEND BUSES_SOURCES buses/spi) + ELSE(UNIX AND NOT APPLE) # Only Linux is supported at the moment #LIST(APPEND BUSES_SOURCES ../contrib/win32/libnfc/buses/spi) MESSAGE( FATAL_ERROR "SPI is only (yet) supported in Linux!" ) - ELSE(NOT UNIX OR APPLE) - LIST(APPEND BUSES_SOURCES buses/spi) - ENDIF(NOT UNIX OR APPLE) + ENDIF(UNIX AND NOT APPLE) ENDIF(SPI_REQUIRED) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/buses)