github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-24 07:05:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

¨fix: osc cmake

Browse source
This commit is contained in:
TrustedUser 2020-04-17 01:59:01 -07:00 • committed by Philippe Teuwen
commit 5003434885
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/CMakeLists.txt
View file

@ -377,7 +377,6 @@ if (APPLE)
message("Apple device detected.") message("Apple device detected.")
set(ADDITIONAL_SRC src/util_darwin.h src/util_darwin.m ${ADDITIONAL_SRC}) set(ADDITIONAL_SRC src/util_darwin.h src/util_darwin.m ${ADDITIONAL_SRC})
set(ADDITIONAL_LNK "-framework Foundation" "-framework AppKit") set(ADDITIONAL_LNK "-framework Foundation" "-framework AppKit")
set_target_properties(proxmark3 PROPERTIES LINK_FLAGS "-Wl,-F/Library/Frameworks")
endif (APPLE) endif (APPLE)
if (MINGW) if (MINGW)
@ -395,16 +394,19 @@ if(NOT Qt5_FOUND)
endif(NOT Qt5_FOUND) endif(NOT Qt5_FOUND)
if (Qt5_FOUND) if (Qt5_FOUND)
message("Qt5 library found, building gui :)") message("Qt5 library found, building gui :)")
add_custom_command(OUTPUT src/proxguiqt.moc.cpp
COMMAND "$(MOC) -o src/proxguiqt.moc.cpp proxguiqt.h"
COMMENT "Creating src/proxguiqt.moc.cpp"
)
set (TARGET_SOURCES set (TARGET_SOURCES
src/proxgui.cpp src/proxgui.cpp
src/proxgui.h src/proxgui.h
src/proxguiqt.cpp src/proxguiqt.cpp
src/proxguiqt.h src/proxguiqt.h
${TARGET_SOURCES}) ${TARGET_SOURCES})
add_custom_command(OUTPUT src/proxguiqt.moc.cpp
COMMAND "$(MOC) -o src/proxguiqt.moc.cpp proxguiqt.h"
COMMENT "Creating src/proxguiqt.moc.cpp"
)
add_definitions("-DHAVE_GUI") add_definitions("-DHAVE_GUI")
set(ADDITIONAL_LNK Qt5::Core Qt5::Widgets Qt5::Gui ${ADDITIONAL_LNK}) set(ADDITIONAL_LNK Qt5::Core Qt5::Widgets Qt5::Gui ${ADDITIONAL_LNK})
endif (Qt5_FOUND) endif (Qt5_FOUND)
@ -415,6 +417,11 @@ add_executable(
${ADDITIONAL_SRC} ${ADDITIONAL_SRC}
) )
if (APPLE)
set_target_properties(proxmark3 PROPERTIES LINK_FLAGS "-Wl,-F/Library/Frameworks")
endif (APPLE)
find_library(jansson REQUIRED) find_library(jansson REQUIRED)
find_library(tinycbor REQUIRED) find_library(tinycbor REQUIRED)
find_library(lua REQUIRED) find_library(lua REQUIRED)