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

- Sync libnfc version in CMake with the one in the autotools;

Browse source 
- Only add gcc-specific options when using gcc.
This commit is contained in:
Romain Tartiere 2010-03-22 20:28:30 +00:00
parent c203ce837c
commit b3b3f47876
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -2,7 +2,7 @@ PROJECT(libnfc C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6) CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
SET(VERSION_MAJOR "1") SET(VERSION_MAJOR "1")
SET(VERSION_MINOR "3") SET(VERSION_MINOR "3")
SET(VERSION_PATCH "2") SET(VERSION_PATCH "3")
SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
@ -59,8 +59,10 @@ ENDIF(LIBNFC_DEBUG_OUTPUT)
# CMake have config.h generation, so we must define this # CMake have config.h generation, so we must define this
ADD_DEFINITIONS("-DHAVE_CONFIG_H") ADD_DEFINITIONS("-DHAVE_CONFIG_H")
# Make sure we will not miss some warnings ;) IF(CMAKE_COMPILER_IS_GNU_CC)
ADD_DEFINITIONS(-Wall -pedantic -std=c99) # Make sure we will not miss some warnings ;)
ADD_DEFINITIONS(-Wall -pedantic -std=c99)
ENDIF(CMAKE_COMPILER_IS_GNU_CC)
# Workarounds for libusb in C99 # Workarounds for libusb in C99
ADD_DEFINITIONS(-Du_int8_t=uint8_t -Du_int16_t=uint16_t) ADD_DEFINITIONS(-Du_int8_t=uint8_t -Du_int16_t=uint16_t)