From a81484f4f44bdc7b7c9048e88e8c7f734591bcaa Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9D=B4=EC=B6=98=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Wed, 13 Mar 2019 14:51:28 +0900 Subject: [PATCH] Remove duplicated '-Wno-ignore-attributes' FLAG (#4704) - Remove duplicated '-Wno-ignore-attributes' FLAG from option files - Add the FLAG into option_linux.cmake Signed-off-by: Chunseok Lee --- cmake/option/option_aarch64-linux.cmake | 9 --------- cmake/option/option_aarch64-tizen.cmake | 9 --------- cmake/option/option_armv7l-linux.cmake | 10 ---------- cmake/option/option_armv7l-tizen.cmake | 10 ---------- cmake/option/option_linux.cmake | 10 ++++++++++ cmake/option/option_x86_64-linux.cmake | 10 ---------- 6 files changed, 10 insertions(+), 48 deletions(-) diff --git a/cmake/option/option_aarch64-linux.cmake b/cmake/option/option_aarch64-linux.cmake index 4fd7650..fa5c920 100644 --- a/cmake/option/option_aarch64-linux.cmake +++ b/cmake/option/option_aarch64-linux.cmake @@ -14,12 +14,3 @@ endif() # addition for aarch64-linux set(FLAGS_COMMON ${FLAGS_COMMON} ) -# remove warning from arm cl -# https://github.com/ARM-software/ComputeLibrary/issues/330 -set(GCC_VERSION_DISABLE_WARNING 6.0) -if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER GCC_VERSION_DISABLE_WARNING) - message(STATUS "GCC version higher than ${GCC_VERSION_DISABLE_WARNING}") - set(FLAGS_CXXONLY ${FLAGS_CXXONLY} - "-Wno-ignored-attributes" - ) -endif() diff --git a/cmake/option/option_aarch64-tizen.cmake b/cmake/option/option_aarch64-tizen.cmake index a0acbdd..5e37f35 100644 --- a/cmake/option/option_aarch64-tizen.cmake +++ b/cmake/option/option_aarch64-tizen.cmake @@ -13,12 +13,3 @@ include("cmake/option/option_linux.cmake") # addition for aarch64-tizen set(FLAGS_COMMON ${FLAGS_COMMON} ) -# remove warning from arm cl -# https://github.com/ARM-software/ComputeLibrary/issues/330 -set(GCC_VERSION_DISABLE_WARNING 6.0) -if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER GCC_VERSION_DISABLE_WARNING) - message(STATUS "GCC version higher than ${GCC_VERSION_DISABLE_WARNING}") - set(FLAGS_CXXONLY ${FLAGS_CXXONLY} - "-Wno-ignored-attributes" - ) -endif() diff --git a/cmake/option/option_armv7l-linux.cmake b/cmake/option/option_armv7l-linux.cmake index 42988bc..d4505ce 100644 --- a/cmake/option/option_armv7l-linux.cmake +++ b/cmake/option/option_armv7l-linux.cmake @@ -19,13 +19,3 @@ set(FLAGS_COMMON ${FLAGS_COMMON} "-funsafe-math-optimizations" "-ftree-vectorize" ) - -# remove warning from arm cl -# https://github.com/ARM-software/ComputeLibrary/issues/330 -set(GCC_VERSION_DISABLE_WARNING 6.0) -if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER GCC_VERSION_DISABLE_WARNING) - message(STATUS "GCC version higher than ${GCC_VERSION_DISABLE_WARNING}") - set(FLAGS_CXXONLY ${FLAGS_CXXONLY} - "-Wno-ignored-attributes" - ) -endif() diff --git a/cmake/option/option_armv7l-tizen.cmake b/cmake/option/option_armv7l-tizen.cmake index 7316772..6040eb6 100644 --- a/cmake/option/option_armv7l-tizen.cmake +++ b/cmake/option/option_armv7l-tizen.cmake @@ -18,13 +18,3 @@ set(FLAGS_COMMON ${FLAGS_COMMON} "-funsafe-math-optimizations" "-ftree-vectorize" ) - -# remove warning from arm cl -# https://github.com/ARM-software/ComputeLibrary/issues/330 -set(GCC_VERSION_DISABLE_WARNING 6.0) -if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER GCC_VERSION_DISABLE_WARNING) - message(STATUS "GCC version higher than ${GCC_VERSION_DISABLE_WARNING}") - set(FLAGS_CXXONLY ${FLAGS_CXXONLY} - "-Wno-ignored-attributes" - ) -endif() diff --git a/cmake/option/option_linux.cmake b/cmake/option/option_linux.cmake index 3ef3e9e..e5c10aa 100644 --- a/cmake/option/option_linux.cmake +++ b/cmake/option/option_linux.cmake @@ -20,5 +20,15 @@ endif() # linux common variable and settings # +# remove warning from arm cl +# https://github.com/ARM-software/ComputeLibrary/issues/330 +set(GCC_VERSION_DISABLE_WARNING 6.0) +if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER GCC_VERSION_DISABLE_WARNING) + message(STATUS "GCC version higher than ${GCC_VERSION_DISABLE_WARNING}") + set(FLAGS_CXXONLY ${FLAGS_CXXONLY} + "-Wno-ignored-attributes" + ) +endif() + # lib pthread as a variable (pthread must be disabled on android) set(LIB_PTHREAD pthread) diff --git a/cmake/option/option_x86_64-linux.cmake b/cmake/option/option_x86_64-linux.cmake index 487df2d..6f4d0eb 100644 --- a/cmake/option/option_x86_64-linux.cmake +++ b/cmake/option/option_x86_64-linux.cmake @@ -10,13 +10,3 @@ include("cmake/option/option_linux.cmake") set(FLAGS_COMMON ${FLAGS_COMMON} "-msse4" ) - -# remove warning from arm cl -# https://github.com/ARM-software/ComputeLibrary/issues/330 -set(GCC_VERSION_DISABLE_WARNING 6.0) -if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER GCC_VERSION_DISABLE_WARNING) - message(STATUS "GCC version higher than ${GCC_VERSION_DISABLE_WARNING}") - set(FLAGS_CXXONLY ${FLAGS_CXXONLY} - "-Wno-ignored-attributes" - ) -endif() -- 2.7.4