From dc6b751ea3ec6bd09396183dc970656c39d99db1 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sat, 18 Apr 2020 15:09:35 +0200
Subject: [PATCH] cmake: rework includes, wip, need to modify more src after
 merge

---
 client/CMakeLists.txt      | 27 +++++++++------------------
 client/deps/amiibo.cmake   |  1 +
 client/deps/jansson.cmake  |  1 +
 client/deps/lua.cmake      |  2 ++
 client/deps/tinycbor.cmake |  5 ++++-
 client/src/emv/emvjson.h   |  2 +-
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index b46e250fc..5f566e35e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -64,24 +64,6 @@ endif(NOT AVX512_FOUND)
 
 add_subdirectory(deps)
 
-include_directories(
-        ..
-        SYSTEM
-        deps
-        ../common
-        ../include
-        deps/jansson
-        deps/tinycbor
-        deps/liblua
-        client/deps/mbedtls/include
-        deps/amiitool
-        deps/cliparser
-        deps/reveng
-        ../common/zlib
-        src
-        src/uart
-)
-
 #file(GLOB_RECURSE TARGET_HEADERS ${CMAKE_CURRENT_LIST_DIR}/src/*.h)
 #file(GLOB_RECURSE TARGET_SOURCES ${CMAKE_CURRENT_LIST_DIR}/src/*.cpp)
 
@@ -274,6 +256,15 @@ add_executable(
         ${ADDITIONAL_SRC}
 )
 
+target_include_directories(proxmark3 PRIVATE
+        ..
+        ../common
+        ../include
+        deps
+        src
+        src/uart
+)
+
 if (APPLE)
     set_target_properties(proxmark3 PROPERTIES LINK_FLAGS "-Wl,-F/Library/Frameworks, -L/usr/local/opt/readline/lib")
     set_target_properties(proxmark3 PROPERTIES COMPILE_FLAGS "-I/usr/local/opt/readline/include")
diff --git a/client/deps/amiibo.cmake b/client/deps/amiibo.cmake
index 0374cb5d3..75501ca0a 100644
--- a/client/deps/amiibo.cmake
+++ b/client/deps/amiibo.cmake
@@ -14,3 +14,4 @@ add_library(amiibo STATIC
 )
 
 target_include_directories(amiibo PRIVATE ../../include ../../common)
+target_include_directories(amiibo INTERFACE amiitool)
diff --git a/client/deps/jansson.cmake b/client/deps/jansson.cmake
index c82694a21..49e059eff 100644
--- a/client/deps/jansson.cmake
+++ b/client/deps/jansson.cmake
@@ -16,3 +16,4 @@ add_library(jansson STATIC
 )
 
 target_compile_definitions(jansson PRIVATE HAVE_STDINT_H)
+target_include_directories(jansson INTERFACE jansson)
diff --git a/client/deps/lua.cmake b/client/deps/lua.cmake
index d0ea7fd12..1863297da 100644
--- a/client/deps/lua.cmake
+++ b/client/deps/lua.cmake
@@ -43,3 +43,5 @@ if (NOT MINGW)
         target_link_libraries(lua INTERFACE dl)
     endif (APPLE)
 endif (NOT MINGW)
+
+target_include_directories(lua INTERFACE liblua)
diff --git a/client/deps/tinycbor.cmake b/client/deps/tinycbor.cmake
index a78d428f5..7e4f78501 100644
--- a/client/deps/tinycbor.cmake
+++ b/client/deps/tinycbor.cmake
@@ -7,4 +7,7 @@ add_library(tinycbor STATIC
         tinycbor/cborpretty.c
         tinycbor/cbortojson.c
         tinycbor/cborvalidation.c
-        )
\ No newline at end of file
+        )
+
+target_include_directories(tinycbor INTERFACE tinycbor)
+
diff --git a/client/src/emv/emvjson.h b/client/src/emv/emvjson.h
index 9b1efb034..f4f3d4fb4 100644
--- a/client/src/emv/emvjson.h
+++ b/client/src/emv/emvjson.h
@@ -12,7 +12,7 @@
 
 #include "common.h"
 
-#include <jansson.h>
+#include "jansson.h"
 #include "tlv.h"
 
 typedef struct {