From 59fab30ba846c32b9ac0fbc6b1855867f063db48 Mon Sep 17 00:00:00 2001 From: Pavlyk Date: Tue, 6 Oct 2020 16:26:33 -0500 Subject: [PATCH] Use INSTALL_PATH in cmake call This ensures that backend libraries are copied into dpctl and included in the conda tar ball. Also fixed copy statement to account for .lib files being in %INSTALL_PREFIX%\lib and .dll files being in %INSTALL_PREFIX%\bin on Windows. --- conda-recipe/bld.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index 31c40e0d24..a44c3dabb0 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -17,7 +17,7 @@ rmdir /S /Q "%INSTALL_PREFIX%" cmake -G Ninja ^ -DCMAKE_BUILD_TYPE=Release ^ - "-DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX%" ^ + "-DCMAKE_INSTALL_PREFIX=%INSTALL_PREFIX%" ^ "-DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX%" ^ "-DDPCPP_ROOT=%DPCPP_ROOT%" ^ "%SRC_DIR%/backends" @@ -29,7 +29,7 @@ IF %ERRORLEVEL% NEQ 0 exit 1 cd .. xcopy install\lib\*.lib dpctl /E /Y -xcopy install\lib\*.dll dpctl /E /Y +xcopy install\bin\*.dll dpctl /E /Y mkdir dpctl\include xcopy backends\include dpctl\include /E /Y