From c9689c74fb81693a34686eaf08cead6fda8b0215 Mon Sep 17 00:00:00 2001
From: Romuald Conty <romuald@libnfc.org>
Date: Wed, 4 Nov 2009 12:03:49 +0000
Subject: [PATCH] It cow compile using CMake.

---
 src/CMakeLists.txt             |  3 ++-
 src/examples/CMakeLists.txt    |  2 +-
 src/lib/CMakeLists.txt         | 30 +++++++++++++++++++++++++++---
 src/lib/buses/CMakeLists.txt   |  2 --
 src/lib/drivers/CMakeLists.txt | 19 -------------------
 5 files changed, 30 insertions(+), 26 deletions(-)
 delete mode 100644 src/lib/buses/CMakeLists.txt
 delete mode 100644 src/lib/drivers/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bd08bea..2c9bb88 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,4 +19,5 @@ ENDIF(MSVC)
 
 INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS} ${PCSC_INCLUDE_DIRS})
 
-ADD_SUBDIRECTORY(lib examples)
+ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(examples)
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index 6093641..5d57533 100644
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(EXAMPLES-SOURCES nfc-list nfc-mfclassic nfc-mfultralight nfcip-initiator nfcip-target nfc-anticol nfc-emulate nfc-relay)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../lib)
 
 # Examples
 FOREACH(source ${EXAMPLES-SOURCES})
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 39cdca1..e2177e8 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -1,7 +1,32 @@
-SET(LIBRARY-SOURCES nfc bitutils)
+# Library's buses
+SET(BUSES_SOURCES buses/uart)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/buses)
+
+# Library's drivers
+SET(DRIVERS_SOURCES drivers/arygon drivers/pn532_uart)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/drivers)
+
+## find PCSC library and headers
+IF(LIBNFC_PCSC)
+  FIND_PACKAGE(PCSC REQUIRED)
+  ADD_DEFINITIONS("-DHAVE_PCSC_LITE=1")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PCSC_CFLAGS_OTHER}")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/acr122")
+ENDIF(LIBNFC_PCSC)
+
+## find libusb library and headers
+IF(LIBNFC_USB)
+  FIND_PACKAGE(LIBUSB REQUIRED)
+  ADD_DEFINITIONS("-DHAVE_LIBUSB=1")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBUSB_CFLAGS_OTHER}")
+  SET(DRIVERS_SOURCES ${DRIVERS_SOURCES} "drivers/pn531" "drivers/pn533")
+ENDIF(LIBNFC_USB)
+
 
 # Library
-ADD_LIBRARY(nfc SHARED ${LIBRARY-SOURCES})
+SET(LIBRARY_SOURCES nfc bitutils ${DRIVERS_SOURCES} ${BUSES_SOURCES})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ADD_LIBRARY(nfc SHARED ${LIBRARY_SOURCES})
 TARGET_LINK_LIBRARIES(nfc ${LIBUSB_LIBRARIES} ${PCSC_LIBRARIES})
 SET_TARGET_PROPERTIES(nfc PROPERTIES SOVERSION 0 VERSION 0.0.0)
 
@@ -28,4 +53,3 @@ IF(MSVC)
 ENDIF(MSVC)
 
 
-ADD_SUBDIRECTORY(buses drivers)
diff --git a/src/lib/buses/CMakeLists.txt b/src/lib/buses/CMakeLists.txt
deleted file mode 100644
index ac25831..0000000
--- a/src/lib/buses/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-SET(LIBRARY-SOURCES uart)
-
diff --git a/src/lib/drivers/CMakeLists.txt b/src/lib/drivers/CMakeLists.txt
deleted file mode 100644
index a1ee863..0000000
--- a/src/lib/drivers/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-SET(LIBRARY-SOURCES arygon pn532_uart)
-
-# find PCSC library and headers
-IF(LIBNFC_PCSC)
-  FIND_PACKAGE(PCSC REQUIRED)
-  ADD_DEFINITIONS("-DHAVE_PCSC_LITE=1")
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PCSC_CFLAGS_OTHER}")
-  SET(LIBRARY-SOURCES ${LIBRARY-SOURCES} "acr122")
-ENDIF(LIBNFC_PCSC)
-
-# find libusb library and headers
-IF(LIBNFC_USB)
-  FIND_PACKAGE(LIBUSB REQUIRED)
-  ADD_DEFINITIONS("-DHAVE_LIBUSB=1")
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBUSB_CFLAGS_OTHER}")
-  SET(LIBRARY-SOURCES ${LIBRARY-SOURCES} "pn531" "pn533")
-ENDIF(LIBNFC_USB)
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib)