From 317db39a5ee295cce5fc0efd67dbaa6bd8efa64a Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Sat, 20 Feb 2021 13:49:33 +0300 Subject: [PATCH 1/2] Enable VA only on selected x86/64 platforms --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39cbe991df..c720db0aeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -395,11 +395,11 @@ OCV_OPTION(WITH_OPENCL_D3D11_NV "Include NVIDIA OpenCL D3D11 support" WITH_DIREC OCV_OPTION(WITH_LIBREALSENSE "Include Intel librealsense support" OFF VISIBLE_IF NOT WITH_INTELPERC VERIFY HAVE_LIBREALSENSE) -OCV_OPTION(WITH_VA "Include VA support" ON - VISIBLE_IF UNIX AND NOT ANDROID +OCV_OPTION(WITH_VA "Include VA support" (X86_64 OR X86) + VISIBLE_IF UNIX AND NOT APPLE AND NOT ANDROID VERIFY HAVE_VA) -OCV_OPTION(WITH_VA_INTEL "Include Intel VA-API/OpenCL support" ON - VISIBLE_IF UNIX AND NOT ANDROID +OCV_OPTION(WITH_VA_INTEL "Include Intel VA-API/OpenCL support" (X86_64 OR X86) + VISIBLE_IF UNIX AND NOT APPLE AND NOT ANDROID VERIFY HAVE_VA_INTEL) OCV_OPTION(WITH_MFX "Include Intel Media SDK support" OFF VISIBLE_IF (UNIX AND NOT ANDROID) OR (WIN32 AND NOT WINRT AND NOT MINGW) From b89410a2661ace352cd67913b3502bf4faa27c52 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Sat, 20 Feb 2021 12:22:51 +0300 Subject: [PATCH 2/2] Fix standalone plugin compilation for Windows --- cmake/OpenCVCompilerOptions.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake index eb39889bd5..40a058d74e 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake @@ -413,11 +413,11 @@ if(APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT DEFINED ENV{LDFLAGS} AND EXISTS "/ endif() if(ENABLE_BUILD_HARDENING) - include(${CMAKE_CURRENT_LIST_DIR}/OpenCVCompilerDefenses.cmake) + include("${CMAKE_CURRENT_LIST_DIR}/OpenCVCompilerDefenses.cmake") endif() if(MSVC) - include(cmake/OpenCVCRTLinkage.cmake) + include("${CMAKE_CURRENT_LIST_DIR}/OpenCVCRTLinkage.cmake") add_definitions(-D_VARIADIC_MAX=10) endif()