From ad4efd21587658544f711014ae74a2b87d5c5b93 Mon Sep 17 00:00:00 2001
From: Aleksandr Solovev <aleksandr.solovev@intel.com>
Date: Fri, 15 Nov 2024 18:03:06 +0100
Subject: [PATCH] fix: Set the correct CPATH for oneAPI toolkit (#2979)

---
 deploy/local/vars_lnx.sh  | 4 ++--
 deploy/local/vars_win.bat | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/deploy/local/vars_lnx.sh b/deploy/local/vars_lnx.sh
index b3b5bbc149c..24a443637a1 100644
--- a/deploy/local/vars_lnx.sh
+++ b/deploy/local/vars_lnx.sh
@@ -247,7 +247,7 @@ if [ "$(basename "${my_script_path}")" = "env" ] ; then   # assume stand-alone
     export DALROOT="$__daal_tmp_dir"
     export PKG_CONFIG_PATH="$__daal_tmp_dir/lib/pkgconfig${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}"
     export CMAKE_PREFIX_PATH="$__daal_tmp_dir${CMAKE_PREFIX_PATH+:${CMAKE_PREFIX_PATH}}"
-    export CPATH="$__daal_tmp_dir/include${CPATH+:${CPATH}}"
+    export CPATH="$__daal_tmp_dir/include:$__daal_tmp_dir/include/dal${CPATH+:${CPATH}}"
     if [ -d "${component_root}/include/dal" ]; then
       export LIBRARY_PATH="$__daal_tmp_dir/lib${LIBRARY_PATH+:${LIBRARY_PATH}}"
       export LD_LIBRARY_PATH="$__daal_tmp_dir/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
@@ -277,7 +277,7 @@ else   # must be a consolidated layout
 
   # *"etc"*)
     export DALROOT="$ONEAPI_ROOT"
-    export CPATH="$ONEAPI_ROOT/include${CPATH+:${CPATH}}"
+    export CPATH="$ONEAPI_ROOT/include:$ONEAPI_ROOT/include/dal${CPATH+:${CPATH}}"
   # ;;
 # esac
 fi
diff --git a/deploy/local/vars_win.bat b/deploy/local/vars_win.bat
index ddc0035719e..3666a72f5a9 100644
--- a/deploy/local/vars_win.bat
+++ b/deploy/local/vars_win.bat
@@ -35,7 +35,7 @@ if "%SCRIPT_PATH%"=="%DAAL%\env\" (
 ) else (
   set "DALROOT=%ONEAPI_ROOT%"
   set "INCLUDE=%ONEAPI_ROOT%\include\dal;%INCLUDE%"
-  set "CPATH=%ONEAPI_ROOT%\include;%CPATH%"
+  set "CPATH=%ONEAPI_ROOT%\include;%ONEAPI_ROOT%\include\dal;%CPATH%"
   goto :GoodArgs2024
 )
 
@@ -53,7 +53,7 @@ exit /b 0
 
 :GoodArgs
 set "DALROOT=%DAAL%"
-set "CPATH=%DAAL%\include;%CPATH%"
+set "CPATH=%DAAL%\include;%DAAL%\include\dal;%CPATH%"
 if exist "%DAAL%\include\dal" (
   set "INCLUDE=%DAAL%\include\dal;%INCLUDE%"
   set "LIB=%DAAL%\lib;%LIB%"