From a98cd3837bde2d65737ff4063ff1d1dde7196587 Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Mon, 26 Apr 2010 14:50:52 +0000 Subject: [PATCH] CMake: fix win32 paths and remove hardcoded definitions. --- CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b8dd35..cb01a75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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)