cmake: rework includes, wip, need to modify more src after merge

This commit is contained in:
Philippe Teuwen
2020-04-18 15:09:35 +02:00
parent f32974bb07
commit dc6b751ea3
6 changed files with 18 additions and 20 deletions

View File

@@ -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")