crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- add pn532_uart to CMake build file

Browse source 
- suppress warnings in Windows builds
- use version 1.3.0 in CMake files as that will be the new version
This commit is contained in:
Francois Kooman 2009-10-06 11:48:18 +00:00
parent b9f834dd57
commit 0cc811d1a6
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -1,6 +1,6 @@
PROJECT(libnfc C) PROJECT(libnfc C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6) 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 # make it easy to locate CMake modules for finding libraries
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/") 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_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LibNFC") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LibNFC")
SET(CPACK_PACKAGE_VERSION_MAJOR "1") SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "2") SET(CPACK_PACKAGE_VERSION_MINOR "3")
SET(CPACK_PACKAGE_VERSION_PATCH "2") SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "NFC Library") SET(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "NFC Library")
SET(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Example Applications") SET(CPACK_COMPONENT_EXAMPLES_DISPLAY_NAME "Example Applications")
SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Development Headers") SET(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Development Headers")

4
src/CMakeLists.txt
View file

@ -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 # find PCSC library and headers
IF(LIBNFC_PCSC) IF(LIBNFC_PCSC)
@ -30,7 +30,7 @@ ENDIF(LIBNFC_LANG_C99 AND NOT MSVC)
IF(MSVC) IF(MSVC)
# We should fix the code, not hide warning! # 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 the stdint headers, because MSVC does not have them
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../win32/stdint) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../win32/stdint)
ENDIF(MSVC) ENDIF(MSVC)