Revert "fix: CPATH env var (#2777)"

This reverts commit e966499.
uxlfoundation · Nov 13, 2024 · 052ac9d · 052ac9d
1 parent a25cb07
commit 052ac9d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/deploy/local/vars_lnx.sh b/deploy/local/vars_lnx.sh
@@ -247,11 +247,12 @@ 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}}"
     if [ -d "${component_root}/include/dal" ]; then
+      export CPATH="$__daal_tmp_dir/include/dal${CPATH+:${CPATH}}"
       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}}"
     else
+      export CPATH="$__daal_tmp_dir/include${CPATH+:${CPATH}}"
       export LIBRARY_PATH="$__daal_tmp_dir/lib/$ARCH_DIR_ONEDAL${LIBRARY_PATH+:${LIBRARY_PATH}}"
       export LD_LIBRARY_PATH="$__daal_tmp_dir/lib/$ARCH_DIR_ONEDAL${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
     fi
@@ -277,7 +278,7 @@ else   # must be a consolidated layout
 
   # *"etc"*)
     export DALROOT="$ONEAPI_ROOT"
-    export CPATH="$ONEAPI_ROOT/include${CPATH+:${CPATH}}"
+    export CPATH="$ONEAPI_ROOT/include/dal${CPATH+:${CPATH}}"
   # ;;
 # esac
 fi
diff --git 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\dal;%CPATH%"
   goto :GoodArgs2024
 )
 
@@ -53,14 +53,15 @@ exit /b 0
 
 :GoodArgs
 set "DALROOT=%DAAL%"
-set "CPATH=%DAAL%\include;%CPATH%"
 if exist "%DAAL%\include\dal" (
   set "INCLUDE=%DAAL%\include\dal;%INCLUDE%"
+  set "CPATH=%DAAL%\include\dal;%CPATH%"
   set "LIB=%DAAL%\lib;%LIB%"
   set "CLASSPATH=%DAAL%\share\java\onedal.jar;%CLASSPATH%"
   set "PATH=%DAAL%\bin;%PATH%"
 ) else (
   set "INCLUDE=%DAAL%\include;%INCLUDE%"
+  set "CPATH=%DAAL%\include;%CPATH%"
   set "LIB=%DAAL%\lib\%DAAL_IA%;%LIB%"
   set "CLASSPATH=%DAAL%\lib\onedal.jar;%CLASSPATH%"
   if exist "%DAAL_UP_OLD%\redist" (