diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cfaf3e..41ef333 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ PROJECT(libnfc C) CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -SET(VERSION "1.2.2") +SET(VERSION "1.3.0") # make it easy to locate CMake modules for finding libraries SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/") @@ -60,8 +60,8 @@ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LibNFC") SET(CPACK_PACKAGE_VERSION_MAJOR "1") -SET(CPACK_PACKAGE_VERSION_MINOR "2") -SET(CPACK_PACKAGE_VERSION_PATCH "2") +SET(CPACK_PACKAGE_VERSION_MINOR "3") +SET(CPACK_PACKAGE_VERSION_PATCH "0") SET(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "NFC Library") SET(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Example Applications") SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Development Headers") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a0d314a..e16108a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -SET(LIBRARY-SOURCES libnfc rs232 bitutils dev_arygon) +SET(LIBRARY-SOURCES libnfc rs232 bitutils dev_arygon dev_pn532_uart) # find PCSC library and headers IF(LIBNFC_PCSC) @@ -30,7 +30,7 @@ ENDIF(LIBNFC_LANG_C99 AND NOT MSVC) IF(MSVC) # We should fix the code, not hide warning! - #ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS") + ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS") # Include the stdint headers, because MSVC does not have them INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../win32/stdint) ENDIF(MSVC)