chg, cmake compiles

This commit is contained in:
iceman1001 2020-05-26 16:57:54 +02:00
parent e7230fa5d7
commit feafa62ded

View file

@ -189,6 +189,7 @@ add_custom_command(
set(ADDITIONAL_SRC "") set(ADDITIONAL_SRC "")
set(ADDITIONAL_LNK "") set(ADDITIONAL_LNK "")
set(ADDITIONAL_DIRS "")
set(X86_CPUS x86 x86_64 i686) set(X86_CPUS x86 x86_64 i686)
message(STATUS "CMAKE_SYSTEM_PROCESSOR := ${CMAKE_SYSTEM_PROCESSOR}") message(STATUS "CMAKE_SYSTEM_PROCESSOR := ${CMAKE_SYSTEM_PROCESSOR}")
@ -227,18 +228,8 @@ endif (BLUEZ_FOUND)
if (PYTHON3_FOUND) if (PYTHON3_FOUND)
message("Python3 library found, building with python3 support :)") message("Python3 library found, building with python3 support :)")
add_definitions("-DHAVE_PYTHON") add_definitions("-DHAVE_PYTHON")
set(ADDITIONAL_DIRS ${ADDITIONAL_DIRS} ${PYTHON3_INCLUDE_DIRS})
#PYTHON3_LIBRARIES ... only the libraries (w/o the '-l')
#PYTHON3_LIBRARY_DIRS ... the paths of the libraries (w/o the '-L')
#PYTHON3_INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I')
message(STATUS "PYTHON3 LIBS := ${PYTHON3_LIBRARIES}")
message(STATUS "PYTHON3 INC DIRS := ${PYTHON3_INCLUDE_DIRS}")
set(ADDITIONAL_LNK ${ADDITIONAL_LNK} ${PYTHON3_LIBRARIES}) set(ADDITIONAL_LNK ${ADDITIONAL_LNK} ${PYTHON3_LIBRARIES})
#PYTHONINCLUDES = pkg-config --cflags python3 == -I/usr/include/python3.6m -I/usr/include/x86_64-linux-gnu/python3.6m
#PYTHONLDLIBS = pkg-config --libs python3 == -lpython3.6m
endif (PYTHON3_FOUND) endif (PYTHON3_FOUND)
add_executable( add_executable(
@ -265,6 +256,7 @@ target_include_directories(proxmark3 PRIVATE
../common_fpga ../common_fpga
../include ../include
src src
${ADDITIONAL_DIRS}
) )
if (APPLE) if (APPLE)