From fc5da9d9359fd9d9a1f036a5a61961828e03eeeb Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Wed, 27 Mar 2024 14:23:51 +0400 Subject: [PATCH] Fixed Android x86_64 build (#23679) ### Details: - JS is not available on Android ### Tickets: - Closes https://github.com/openvinotoolkit/openvino/issues/23494 --- cmake/features.cmake | 2 +- src/plugins/intel_cpu/CMakeLists.txt | 4 ++-- src/plugins/intel_gpu/CMakeLists.txt | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cmake/features.cmake b/cmake/features.cmake index 9a8b9eacc90..6de4f9d962d 100644 --- a/cmake/features.cmake +++ b/cmake/features.cmake @@ -177,7 +177,7 @@ ov_dependent_option (ENABLE_SYSTEM_SNAPPY "Enables use of system version of Snap ov_dependent_option (ENABLE_PYTHON_PACKAGING "Enables packaging of Python API in APT / YUM" OFF "ENABLE_PYTHON;UNIX" OFF) -ov_option(ENABLE_JS "Enables JS API building" ON) +ov_dependent_option(ENABLE_JS "Enables JS API building" ON "NOT ANDROID" OFF) ov_option(ENABLE_OPENVINO_DEBUG "Enable output for OPENVINO_DEBUG statements" OFF) diff --git a/src/plugins/intel_cpu/CMakeLists.txt b/src/plugins/intel_cpu/CMakeLists.txt index 5e494c29b86..074d4fd6c36 100644 --- a/src/plugins/intel_cpu/CMakeLists.txt +++ b/src/plugins/intel_cpu/CMakeLists.txt @@ -22,8 +22,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") # oneDNN arm64: unary minus operator applied to unsigned type, result still unsigned ov_add_compiler_flags(/wd4146) elseif(OV_COMPILER_IS_CLANG) - # -Wno-delete-non-abstract-non-virtual-dtor is support > clang8.0 - if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8) + # -Wno-delete-non-abstract-non-virtual-dtor is support > clang 9.0 + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9.0) ov_add_compiler_flags(-Wno-delete-non-abstract-non-virtual-dtor) else() ov_add_compiler_flags(-Wno-delete-non-virtual-dtor) diff --git a/src/plugins/intel_gpu/CMakeLists.txt b/src/plugins/intel_gpu/CMakeLists.txt index 7d102a2ec13..2f3d9127dde 100644 --- a/src/plugins/intel_gpu/CMakeLists.txt +++ b/src/plugins/intel_gpu/CMakeLists.txt @@ -17,7 +17,12 @@ if(CMAKE_COMPILER_IS_GNUCXX) endif() if(OV_COMPILER_IS_CLANG) - ov_add_compiler_flags(-Wno-delete-non-abstract-non-virtual-dtor) + # -Wno-delete-non-abstract-non-virtual-dtor is support > clang 9.0 + if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9.0) + ov_add_compiler_flags(-Wno-delete-non-abstract-non-virtual-dtor) + else() + ov_add_compiler_flags(-Wno-delete-non-virtual-dtor) + endif() endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")