From 5c7c80dd27abb24051097653823f7b8f22d8ac33 Mon Sep 17 00:00:00 2001 From: Xiping Yan Date: Fri, 10 Apr 2020 20:23:13 +0800 Subject: [PATCH] Merge pull request #17028 from xipingyan:patch-1 * Update OpenCVFindVA_INTEL.cmake When set env VA_INTEL_IOCL_ROOT, "if($ENV{VA_INTEL_IOCL_ROOT})" don't work. My modification as follow. - if($ENV{VA_INTEL_IOCL_ROOT}) + if(DEFINED ENV{VA_INTEL_IOCL_ROOT}) Refer: https://cmake.org/cmake/help/latest/variable/ENV.html * based on merge comment, update code --- cmake/OpenCVFindVA_INTEL.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/OpenCVFindVA_INTEL.cmake b/cmake/OpenCVFindVA_INTEL.cmake index 63d0f15a36..fcee37eb89 100644 --- a/cmake/OpenCVFindVA_INTEL.cmake +++ b/cmake/OpenCVFindVA_INTEL.cmake @@ -5,10 +5,9 @@ # VA_INTEL_IOCL_ROOT - root of Intel OCL installation if(UNIX AND NOT ANDROID) - if($ENV{VA_INTEL_IOCL_ROOT}) - set(VA_INTEL_IOCL_ROOT $ENV{VA_INTEL_IOCL_ROOT}) - else() - set(VA_INTEL_IOCL_ROOT "/opt/intel/opencl") + ocv_check_environment_variables(VA_INTEL_IOCL_ROOT) + if(NOT DEFINED VA_INTEL_IOCL_ROOT) + set(VA_INTEL_IOCL_ROOT "/opt/intel/opencl") endif() find_path(