Skip to content

Commit ad4efd2

Browse files
fix: Set the correct CPATH for oneAPI toolkit (#2979)
1 parent 6db97a2 commit ad4efd2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

deploy/local/vars_lnx.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ if [ "$(basename "${my_script_path}")" = "env" ] ; then # assume stand-alone
247247
export DALROOT="$__daal_tmp_dir"
248248
export PKG_CONFIG_PATH="$__daal_tmp_dir/lib/pkgconfig${PKG_CONFIG_PATH+:${PKG_CONFIG_PATH}}"
249249
export CMAKE_PREFIX_PATH="$__daal_tmp_dir${CMAKE_PREFIX_PATH+:${CMAKE_PREFIX_PATH}}"
250-
export CPATH="$__daal_tmp_dir/include${CPATH+:${CPATH}}"
250+
export CPATH="$__daal_tmp_dir/include:$__daal_tmp_dir/include/dal${CPATH+:${CPATH}}"
251251
if [ -d "${component_root}/include/dal" ]; then
252252
export LIBRARY_PATH="$__daal_tmp_dir/lib${LIBRARY_PATH+:${LIBRARY_PATH}}"
253253
export LD_LIBRARY_PATH="$__daal_tmp_dir/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}"
@@ -277,7 +277,7 @@ else # must be a consolidated layout
277277

278278
# *"etc"*)
279279
export DALROOT="$ONEAPI_ROOT"
280-
export CPATH="$ONEAPI_ROOT/include${CPATH+:${CPATH}}"
280+
export CPATH="$ONEAPI_ROOT/include:$ONEAPI_ROOT/include/dal${CPATH+:${CPATH}}"
281281
# ;;
282282
# esac
283283
fi

deploy/local/vars_win.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if "%SCRIPT_PATH%"=="%DAAL%\env\" (
3535
) else (
3636
set "DALROOT=%ONEAPI_ROOT%"
3737
set "INCLUDE=%ONEAPI_ROOT%\include\dal;%INCLUDE%"
38-
set "CPATH=%ONEAPI_ROOT%\include;%CPATH%"
38+
set "CPATH=%ONEAPI_ROOT%\include;%ONEAPI_ROOT%\include\dal;%CPATH%"
3939
goto :GoodArgs2024
4040
)
4141

@@ -53,7 +53,7 @@ exit /b 0
5353

5454
:GoodArgs
5555
set "DALROOT=%DAAL%"
56-
set "CPATH=%DAAL%\include;%CPATH%"
56+
set "CPATH=%DAAL%\include;%DAAL%\include\dal;%CPATH%"
5757
if exist "%DAAL%\include\dal" (
5858
set "INCLUDE=%DAAL%\include\dal;%INCLUDE%"
5959
set "LIB=%DAAL%\lib;%LIB%"

0 commit comments

Comments
 (0)