From 53af4304c163fabfb770c8b5a1e00ff97ab66de7 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Wed, 6 May 2020 14:45:02 +0200 Subject: [PATCH] cmake deps: add prefix pm3rrg_rdv4_ --- client/CMakeLists.txt | 18 ++++---- client/deps/amiibo.cmake | 10 ++--- client/deps/cliparser.cmake | 10 ++--- client/deps/hardnested.cmake | 80 ++++++++++++++++++------------------ client/deps/jansson.cmake | 10 ++--- client/deps/lua.cmake | 16 ++++---- client/deps/mbedtls.cmake | 8 ++-- client/deps/reveng.cmake | 12 +++--- client/deps/tinycbor.cmake | 8 ++-- client/deps/zlib.cmake | 8 ++-- 10 files changed, 90 insertions(+), 90 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 921e0d04b..7b17c1e36 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -252,16 +252,16 @@ else (APPLE) endif (APPLE) -find_library(cliparser REQUIRED) -find_library(jansson REQUIRED) -find_library(tinycbor REQUIRED) -find_library(lua REQUIRED) -find_library(mbedtls REQUIRED) -find_library(reveng REQUIRED) -find_library(z REQUIRED) -find_library(hardnested REQUIRED) +find_library(pm3rrg_rdv4_cliparser REQUIRED) +find_library(pm3rrg_rdv4_jansson REQUIRED) +find_library(pm3rrg_rdv4_tinycbor REQUIRED) +find_library(pm3rrg_rdv4_lua REQUIRED) +find_library(pm3rrg_rdv4_mbedtls REQUIRED) +find_library(pm3rrg_rdv4_reveng REQUIRED) +find_library(pm3rrg_rdv4_z REQUIRED) +find_library(pm3rrg_rdv4_hardnested REQUIRED) -target_link_libraries(proxmark3 PRIVATE readline pthread m mbedtls cliparser jansson lua tinycbor amiibo reveng z hardnested ${ADDITIONAL_LNK}) +target_link_libraries(proxmark3 PRIVATE readline pthread m pm3rrg_rdv4_mbedtls pm3rrg_rdv4_cliparser pm3rrg_rdv4_jansson pm3rrg_rdv4_lua pm3rrg_rdv4_tinycbor pm3rrg_rdv4_amiibo pm3rrg_rdv4_reveng pm3rrg_rdv4_z pm3rrg_rdv4_hardnested ${ADDITIONAL_LNK}) install(TARGETS proxmark3 DESTINATION "bin") install(DIRECTORY cmdscripts lualibs luascripts resources dictionaries DESTINATION "share/proxmark3") diff --git a/client/deps/amiibo.cmake b/client/deps/amiibo.cmake index 33ca39f38..34780f597 100644 --- a/client/deps/amiibo.cmake +++ b/client/deps/amiibo.cmake @@ -5,13 +5,13 @@ #amiitool.c $(MYSRCS) ../../../../common/../../commonutil.c ../ui.c -lreadline -lm ../../../../common/mbedtls/libmbedtls.a \ #-o amiitool -add_library(amiibo STATIC +add_library(pm3rrg_rdv4_amiibo STATIC amiitool/amiibo.c amiitool/drbg.c amiitool/keygen.c ) -target_include_directories(amiibo PRIVATE ../../include ../../common) -target_include_directories(amiibo INTERFACE amiitool) -target_compile_options(amiibo PRIVATE -Wall -Werror -O3) -set_property(TARGET amiibo PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(pm3rrg_rdv4_amiibo PRIVATE ../../include ../../common) +target_include_directories(pm3rrg_rdv4_amiibo INTERFACE amiitool) +target_compile_options(pm3rrg_rdv4_amiibo PRIVATE -Wall -Werror -O3) +set_property(TARGET pm3rrg_rdv4_amiibo PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/client/deps/cliparser.cmake b/client/deps/cliparser.cmake index ca3e0bf6d..b16451c07 100644 --- a/client/deps/cliparser.cmake +++ b/client/deps/cliparser.cmake @@ -1,12 +1,12 @@ -add_library(cliparser STATIC +add_library(pm3rrg_rdv4_cliparser STATIC cliparser/argtable3.c cliparser/cliparser.c ) -target_include_directories(cliparser PRIVATE +target_include_directories(pm3rrg_rdv4_cliparser PRIVATE ../../common ../../include ../src) -target_include_directories(cliparser INTERFACE cliparser) -target_compile_options(cliparser PRIVATE -Wall -Werror -O3) -set_property(TARGET cliparser PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(pm3rrg_rdv4_cliparser INTERFACE cliparser) +target_compile_options(pm3rrg_rdv4_cliparser PRIVATE -Wall -Werror -O3) +set_property(TARGET pm3rrg_rdv4_cliparser PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/client/deps/hardnested.cmake b/client/deps/hardnested.cmake index 5dbca2dbd..9efff1445 100644 --- a/client/deps/hardnested.cmake +++ b/client/deps/hardnested.cmake @@ -1,11 +1,11 @@ -add_library(hardnested_nosimd OBJECT +add_library(pm3rrg_rdv4_hardnested_nosimd OBJECT hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c) -target_compile_options(hardnested_nosimd PRIVATE -Wall -Werror -O3) -set_property(TARGET hardnested_nosimd PROPERTY POSITION_INDEPENDENT_CODE ON) +target_compile_options(pm3rrg_rdv4_hardnested_nosimd PRIVATE -Wall -Werror -O3) +set_property(TARGET pm3rrg_rdv4_hardnested_nosimd PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(hardnested_nosimd PRIVATE +target_include_directories(pm3rrg_rdv4_hardnested_nosimd PRIVATE ../../common ../../include) @@ -19,98 +19,98 @@ message(STATUS "CMAKE_SYSTEM_PROCESSOR := ${CMAKE_SYSTEM_PROCESSOR}") if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS) message(STATUS "Building optimised x86/x86_64 binaries") - target_compile_options(hardnested_nosimd BEFORE PRIVATE + target_compile_options(pm3rrg_rdv4_hardnested_nosimd BEFORE PRIVATE -mno-mmx -mno-sse2 -mno-avx -mno-avx2 -mno-avx512f) ## x86 / MMX - add_library(hardnested_mmx OBJECT + add_library(pm3rrg_rdv4_hardnested_mmx OBJECT hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c) - target_compile_options(hardnested_mmx PRIVATE -Wall -Werror -O3) - target_compile_options(hardnested_mmx BEFORE PRIVATE + target_compile_options(pm3rrg_rdv4_hardnested_mmx PRIVATE -Wall -Werror -O3) + target_compile_options(pm3rrg_rdv4_hardnested_mmx BEFORE PRIVATE -mmmx -mno-sse2 -mno-avx -mno-avx2 -mno-avx512f) - set_property(TARGET hardnested_mmx PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET pm3rrg_rdv4_hardnested_mmx PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(hardnested_mmx PRIVATE + target_include_directories(pm3rrg_rdv4_hardnested_mmx PRIVATE ../../common ../../include) ## x86 / SSE2 - add_library(hardnested_sse2 OBJECT + add_library(pm3rrg_rdv4_hardnested_sse2 OBJECT hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c) - target_compile_options(hardnested_sse2 PRIVATE -Wall -Werror -O3) - target_compile_options(hardnested_sse2 BEFORE PRIVATE + target_compile_options(pm3rrg_rdv4_hardnested_sse2 PRIVATE -Wall -Werror -O3) + target_compile_options(pm3rrg_rdv4_hardnested_sse2 BEFORE PRIVATE -mmmx -msse2 -mno-avx -mno-avx2 -mno-avx512f) - set_property(TARGET hardnested_sse2 PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET pm3rrg_rdv4_hardnested_sse2 PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(hardnested_sse2 PRIVATE + target_include_directories(pm3rrg_rdv4_hardnested_sse2 PRIVATE ../../common ../../include) ## x86 / AVX - add_library(hardnested_avx OBJECT + add_library(pm3rrg_rdv4_hardnested_avx OBJECT hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c) - target_compile_options(hardnested_avx PRIVATE -Wall -Werror -O3) - target_compile_options(hardnested_avx BEFORE PRIVATE + target_compile_options(pm3rrg_rdv4_hardnested_avx PRIVATE -Wall -Werror -O3) + target_compile_options(pm3rrg_rdv4_hardnested_avx BEFORE PRIVATE -mmmx -msse2 -mavx -mno-avx2 -mno-avx512f) - set_property(TARGET hardnested_avx PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET pm3rrg_rdv4_hardnested_avx PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(hardnested_avx PRIVATE + target_include_directories(pm3rrg_rdv4_hardnested_avx PRIVATE ../../common ../../include) ## x86 / AVX2 - add_library(hardnested_avx2 OBJECT + add_library(pm3rrg_rdv4_hardnested_avx2 OBJECT hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c) - target_compile_options(hardnested_avx2 PRIVATE -Wall -Werror -O3) - target_compile_options(hardnested_avx2 BEFORE PRIVATE + target_compile_options(pm3rrg_rdv4_hardnested_avx2 PRIVATE -Wall -Werror -O3) + target_compile_options(pm3rrg_rdv4_hardnested_avx2 BEFORE PRIVATE -mmmx -msse2 -mavx -mavx2 -mno-avx512f) - set_property(TARGET hardnested_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET pm3rrg_rdv4_hardnested_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(hardnested_avx2 PRIVATE + target_include_directories(pm3rrg_rdv4_hardnested_avx2 PRIVATE ../../common ../../include) ## x86 / AVX512 - add_library(hardnested_avx512 OBJECT + add_library(pm3rrg_rdv4_hardnested_avx512 OBJECT hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c) - target_compile_options(hardnested_avx512 PRIVATE -Wall -Werror -O3) - target_compile_options(hardnested_avx512 BEFORE PRIVATE + target_compile_options(pm3rrg_rdv4_hardnested_avx512 PRIVATE -Wall -Werror -O3) + target_compile_options(pm3rrg_rdv4_hardnested_avx512 BEFORE PRIVATE -mmmx -msse2 -mavx -mavx2 -mavx512f) - set_property(TARGET hardnested_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON) + set_property(TARGET pm3rrg_rdv4_hardnested_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON) - target_include_directories(hardnested_avx512 PRIVATE + target_include_directories(pm3rrg_rdv4_hardnested_avx512 PRIVATE ../../common ../../include) set(SIMD_TARGETS - $ - $ - $ - $ - $) + $ + $ + $ + $ + $) else () message(STATUS "Not building optimised targets") set(SIMD_TARGETS) endif () -add_library(hardnested STATIC +add_library(pm3rrg_rdv4_hardnested STATIC hardnested/hardnested_bruteforce.c - $ + $ ${SIMD_TARGETS}) -set_property(TARGET hardnested PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(hardnested PRIVATE +set_property(TARGET pm3rrg_rdv4_hardnested PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(pm3rrg_rdv4_hardnested PRIVATE ../../common ../../include ../src jansson) -target_include_directories(hardnested INTERFACE hardnested) +target_include_directories(pm3rrg_rdv4_hardnested INTERFACE hardnested) diff --git a/client/deps/jansson.cmake b/client/deps/jansson.cmake index d3054b158..a95ff0baf 100644 --- a/client/deps/jansson.cmake +++ b/client/deps/jansson.cmake @@ -1,4 +1,4 @@ -add_library(jansson STATIC +add_library(pm3rrg_rdv4_jansson STATIC jansson/dump.c jansson/error.c jansson/hashtable.c @@ -13,7 +13,7 @@ add_library(jansson STATIC jansson/value.c ) -target_compile_definitions(jansson PRIVATE HAVE_STDINT_H) -target_include_directories(jansson INTERFACE jansson) -target_compile_options(jansson PRIVATE -Wall -Werror -Wno-unused-function -O3) -set_property(TARGET jansson PROPERTY POSITION_INDEPENDENT_CODE ON) +target_compile_definitions(pm3rrg_rdv4_jansson PRIVATE HAVE_STDINT_H) +target_include_directories(pm3rrg_rdv4_jansson INTERFACE jansson) +target_compile_options(pm3rrg_rdv4_jansson PRIVATE -Wall -Werror -Wno-unused-function -O3) +set_property(TARGET pm3rrg_rdv4_jansson PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/client/deps/lua.cmake b/client/deps/lua.cmake index b5267c561..679147124 100644 --- a/client/deps/lua.cmake +++ b/client/deps/lua.cmake @@ -1,4 +1,4 @@ -add_library(lua STATIC +add_library(pm3rrg_rdv4_lua STATIC liblua/lapi.c liblua/lcode.c liblua/lctype.c @@ -33,17 +33,17 @@ add_library(lua STATIC liblua/linit.c ) -target_compile_definitions(lua PRIVATE LUA_COMPAT_ALL) +target_compile_definitions(pm3rrg_rdv4_lua PRIVATE LUA_COMPAT_ALL) if (NOT MINGW) if (APPLE) - target_compile_definitions(lua PRIVATE LUA_USE_MACOSX) + target_compile_definitions(pm3rrg_rdv4_lua PRIVATE LUA_USE_MACOSX) else (APPLE) - target_compile_definitions(lua PRIVATE LUA_USE_LINUX) - target_link_libraries(lua INTERFACE dl) + target_compile_definitions(pm3rrg_rdv4_lua PRIVATE LUA_USE_LINUX) + target_link_libraries(pm3rrg_rdv4_lua INTERFACE dl) endif (APPLE) endif (NOT MINGW) -target_include_directories(lua INTERFACE liblua) -target_compile_options(lua PRIVATE -Wall -Werror -O3) -set_property(TARGET lua PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(pm3rrg_rdv4_lua INTERFACE liblua) +target_compile_options(pm3rrg_rdv4_lua PRIVATE -Wall -Werror -O3) +set_property(TARGET pm3rrg_rdv4_lua PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/client/deps/mbedtls.cmake b/client/deps/mbedtls.cmake index 5f6cff8b5..63e706889 100644 --- a/client/deps/mbedtls.cmake +++ b/client/deps/mbedtls.cmake @@ -1,4 +1,4 @@ -add_library(mbedtls STATIC +add_library(pm3rrg_rdv4_mbedtls STATIC ../../common/mbedtls/aes.c ../../common/mbedtls/asn1parse.c ../../common/mbedtls/asn1write.c @@ -44,6 +44,6 @@ add_library(mbedtls STATIC ../../common/mbedtls/x509_crt.c ) -target_include_directories(mbedtls PRIVATE ../../common) -target_compile_options(mbedtls PRIVATE -Wall -Werror -O3) -set_property(TARGET mbedtls PROPERTY POSITION_INDEPENDENT_CODE ON) +target_include_directories(pm3rrg_rdv4_mbedtls PRIVATE ../../common) +target_compile_options(pm3rrg_rdv4_mbedtls PRIVATE -Wall -Werror -O3) +set_property(TARGET pm3rrg_rdv4_mbedtls PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/client/deps/reveng.cmake b/client/deps/reveng.cmake index c32de008a..d5f3259ed 100644 --- a/client/deps/reveng.cmake +++ b/client/deps/reveng.cmake @@ -1,4 +1,4 @@ -add_library(reveng STATIC +add_library(pm3rrg_rdv4_reveng STATIC reveng/bmpbit.c reveng/cli.c reveng/model.c @@ -7,8 +7,8 @@ add_library(reveng STATIC reveng/reveng.c ) -target_compile_definitions(reveng PRIVATE PRESETS) -target_include_directories(reveng PRIVATE ../cliparser) -target_include_directories(reveng INTERFACE reveng) -target_compile_options(reveng PRIVATE -Wall -Werror -O3) -set_property(TARGET reveng PROPERTY POSITION_INDEPENDENT_CODE ON) +target_compile_definitions(pm3rrg_rdv4_reveng PRIVATE PRESETS) +target_include_directories(pm3rrg_rdv4_reveng PRIVATE ../cliparser) +target_include_directories(pm3rrg_rdv4_reveng INTERFACE reveng) +target_compile_options(pm3rrg_rdv4_reveng PRIVATE -Wall -Werror -O3) +set_property(TARGET pm3rrg_rdv4_reveng PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/client/deps/tinycbor.cmake b/client/deps/tinycbor.cmake index d7a51672d..5a6abda25 100644 --- a/client/deps/tinycbor.cmake +++ b/client/deps/tinycbor.cmake @@ -1,4 +1,4 @@ -add_library(tinycbor STATIC +add_library(pm3rrg_rdv4_tinycbor STATIC tinycbor/cborencoder.c tinycbor/cborencoder_close_container_checked.c tinycbor/cborerrorstrings.c @@ -9,7 +9,7 @@ add_library(tinycbor STATIC tinycbor/cborvalidation.c ) -target_include_directories(tinycbor INTERFACE tinycbor) +target_include_directories(pm3rrg_rdv4_tinycbor INTERFACE tinycbor) # Strange errors on Mingw when compiling with -O3 -target_compile_options(tinycbor PRIVATE -Wall -Werror -O2) -set_property(TARGET tinycbor PROPERTY POSITION_INDEPENDENT_CODE ON) +target_compile_options(pm3rrg_rdv4_tinycbor PRIVATE -Wall -Werror -O2) +set_property(TARGET pm3rrg_rdv4_tinycbor PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/client/deps/zlib.cmake b/client/deps/zlib.cmake index fabfc218a..645cbc88d 100644 --- a/client/deps/zlib.cmake +++ b/client/deps/zlib.cmake @@ -1,4 +1,4 @@ -add_library(z STATIC +add_library(pm3rrg_rdv4_z STATIC ../../common/zlib/deflate.c ../../common/zlib/adler32.c ../../common/zlib/trees.c @@ -8,6 +8,6 @@ add_library(z STATIC ../../common/zlib/inftrees.c ) -target_compile_definitions(z PRIVATE Z_SOLO NO_GZIP ZLIB_PM3_TUNED) -target_compile_options(z PRIVATE -Wall -Werror -O3) -set_property(TARGET z PROPERTY POSITION_INDEPENDENT_CODE ON) +target_compile_definitions(pm3rrg_rdv4_z PRIVATE Z_SOLO NO_GZIP ZLIB_PM3_TUNED) +target_compile_options(pm3rrg_rdv4_z PRIVATE -Wall -Werror -O3) +set_property(TARGET pm3rrg_rdv4_z PROPERTY POSITION_INDEPENDENT_CODE ON)