CMake: fix win32 paths and remove hardcoded definitions.

This commit is contained in:
Romuald Conty 2010-04-26 14:50:52 +00:00
parent 6f04f3cb92
commit a98cd3837b

View file

@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/incl
# Win32
IF(MSVC)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/win32 ${CMAKE_CURRENT_SOURCE_DIR}/win32/stdint)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/contrib/win32 ${CMAKE_CURRENT_SOURCE_DIR}/contrib/win32/stdint)
ENDIF(MSVC)
# make it easy to locate CMake modules for finding libraries
@ -83,12 +83,6 @@ IF(NOT MSVC)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
ENDIF(NOT MSVC)
ADD_DEFINITIONS(-DDRIVER_ACR122_ENABLED)
ADD_DEFINITIONS(-DDRIVER_PN531_USB_ENABLED)
ADD_DEFINITIONS(-DDRIVER_PN533_USB_ENABLED)
ADD_DEFINITIONS(-DDRIVER_ARYGON_ENABLED)
#ADD_DEFINITIONS(-DDRIVER_PN532_UART_ENABLED)
ADD_SUBDIRECTORY(libnfc)
ADD_SUBDIRECTORY(include)
ADD_SUBDIRECTORY(examples)