From f9857a8b0c2ba4a0e6eecc8e83e65645bb2b3cb9 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sat, 18 Apr 2020 17:37:11 +0200 Subject: [PATCH] cmake: add cflags --- client/CMakeLists.txt | 5 ++--- client/deps/amiibo.cmake | 1 + client/deps/hardnested.cmake | 6 ++++++ client/deps/jansson.cmake | 1 + client/deps/lua.cmake | 1 + client/deps/mbedtls.cmake | 1 + client/deps/reveng.cmake | 1 + client/deps/tinycbor.cmake | 2 +- client/deps/zlib.cmake | 1 + 9 files changed, 15 insertions(+), 4 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 5f566e35e..3c6c44767 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -224,9 +224,6 @@ if (MINGW) set(CMAKE_CXX_FLAGS "-mno-ms-bitfields -fexec-charset=cp850 ${CMAKE_CXX_FLAGS}") endif (MINGW) -set(CMAKE_CXX_FLAGS "-Wall -Werror -O3") - - if(NOT Qt5_FOUND) message("Qt5 library not found, not building gui") set(TARGET_SOURCES @@ -256,6 +253,8 @@ add_executable( ${ADDITIONAL_SRC} ) +target_compile_options(proxmark3 PUBLIC -Wall -Werror -O3) + target_include_directories(proxmark3 PRIVATE .. ../common diff --git a/client/deps/amiibo.cmake b/client/deps/amiibo.cmake index 75501ca0a..dd185fc91 100644 --- a/client/deps/amiibo.cmake +++ b/client/deps/amiibo.cmake @@ -15,3 +15,4 @@ add_library(amiibo STATIC target_include_directories(amiibo PRIVATE ../../include ../../common) target_include_directories(amiibo INTERFACE amiitool) +target_compile_options(amiibo PRIVATE -Wall -Werror -O3) diff --git a/client/deps/hardnested.cmake b/client/deps/hardnested.cmake index 76ae3b53b..708203eb7 100644 --- a/client/deps/hardnested.cmake +++ b/client/deps/hardnested.cmake @@ -9,6 +9,7 @@ add_library(hardnested_nosimd OBJECT target_include_directories(hardnested_nosimd PRIVATE ../../common ../../include) +target_compile_options(hardnested_nosimd PRIVATE -Wall -Werror -O3) set(X86_CPUS x86 x86_64 i686) @@ -26,6 +27,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS) 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 -mmmx -mno-sse2 -mno-avx -mno-avx2 -mno-avx512f) @@ -40,6 +42,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS) 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 -mmmx -msse2 -mno-avx -mno-avx2 -mno-avx512f) @@ -54,6 +57,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS) 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 -mmmx -msse2 -mavx -mno-avx2 -mno-avx512f) @@ -68,6 +72,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS) 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 -mmmx -msse2 -mavx -mavx2 -mno-avx512f) @@ -82,6 +87,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS) 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 -mmmx -msse2 -mavx -mavx2 -mavx512f) diff --git a/client/deps/jansson.cmake b/client/deps/jansson.cmake index 49e059eff..b2042c6b4 100644 --- a/client/deps/jansson.cmake +++ b/client/deps/jansson.cmake @@ -17,3 +17,4 @@ add_library(jansson STATIC 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) diff --git a/client/deps/lua.cmake b/client/deps/lua.cmake index 1863297da..3850863b5 100644 --- a/client/deps/lua.cmake +++ b/client/deps/lua.cmake @@ -45,3 +45,4 @@ if (NOT MINGW) endif (NOT MINGW) target_include_directories(lua INTERFACE liblua) +target_compile_options(lua PRIVATE -Wall -Werror -O3) diff --git a/client/deps/mbedtls.cmake b/client/deps/mbedtls.cmake index e0cc2d91f..13b08bec0 100644 --- a/client/deps/mbedtls.cmake +++ b/client/deps/mbedtls.cmake @@ -47,3 +47,4 @@ add_library(mbedtls STATIC ) target_include_directories(mbedtls PRIVATE ../../common) +target_compile_options(mbedtls PRIVATE -Wall -Werror -O3) diff --git a/client/deps/reveng.cmake b/client/deps/reveng.cmake index 425f98331..80fd2930b 100644 --- a/client/deps/reveng.cmake +++ b/client/deps/reveng.cmake @@ -12,3 +12,4 @@ add_library(reveng STATIC target_compile_definitions(reveng PRIVATE PRESETS) target_include_directories(reveng PRIVATE .) +target_compile_options(reveng PRIVATE -Wall -Werror -O3) diff --git a/client/deps/tinycbor.cmake b/client/deps/tinycbor.cmake index 7e4f78501..b3247d1e7 100644 --- a/client/deps/tinycbor.cmake +++ b/client/deps/tinycbor.cmake @@ -10,4 +10,4 @@ add_library(tinycbor STATIC ) target_include_directories(tinycbor INTERFACE tinycbor) - +target_compile_options(tinycbor PRIVATE -Wall -Werror -O2) diff --git a/client/deps/zlib.cmake b/client/deps/zlib.cmake index c78522a66..882022ab5 100644 --- a/client/deps/zlib.cmake +++ b/client/deps/zlib.cmake @@ -11,3 +11,4 @@ add_library(z STATIC ) target_compile_definitions(z PRIVATE Z_SOLO NO_GZIP ZLIB_PM3_TUNED) +target_compile_options(z PRIVATE -Wall -Werror -O3)