mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-19 06:53:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19610 from mshabunin:plugin-va-compile

Browse Source
This commit is contained in:
Alexander Alekhin 2021-02-24 10:08:11 +00:00
commit 3a062eed5b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -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)

4
cmake/OpenCVCompilerOptions.cmake
View File

@ -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()