Commit: 78b9a124cdac52b856459d7ae53c92c64ae1ec72
Author: Sergey Sharybin
Date: Tue Jun 21 12:12:13 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB78b9a124cdac52b856459d7ae53c92c64ae1ec72
Build Deps: Tweak install directory for igc and ocloc
Matches path at which ahead-of-time kernel compilation expects
them to be.
===================================================================
M build_files/build_environment/cmake/igc.cmake
M build_files/build_environment/cmake/ocloc.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/igc.cmake
b/build_files/build_environment/cmake/igc.cmake
index faae8d00611..2d6e19de34d 100644
--- a/build_files/build_environment/cmake/igc.cmake
+++ b/build_files/build_environment/cmake/igc.cmake
@@ -88,7 +88,7 @@ ExternalProject_Add(external_igc
URL file://${PACKAGE_DIR}/${IGC_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${IGC_HASH_TYPE}=${IGC_HASH}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/igc ${DEFAULT_CMAKE_FLAGS}
${IGC_EXTRA_ARGS}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp/lib/igc
${DEFAULT_CMAKE_FLAGS} ${IGC_EXTRA_ARGS}
# IGC is pretty set in its way where sub projects ought to live, for some it
offers
# hooks to supply alternatives folders, other are just hardocded with no way
to configure
diff --git a/build_files/build_environment/cmake/ocloc.cmake
b/build_files/build_environment/cmake/ocloc.cmake
index f686d2dd4fc..b38f31de189 100644
--- a/build_files/build_environment/cmake/ocloc.cmake
+++ b/build_files/build_environment/cmake/ocloc.cmake
@@ -13,7 +13,7 @@ ExternalProject_Add(external_ocloc
URL_HASH ${OCLOC_HASH_TYPE}=${OCLOC_HASH}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
PREFIX ${BUILD_DIR}/ocloc
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ocloc ${DEFAULT_CMAKE_FLAGS}
${OCLOC_EXTRA_ARGS}
+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/dpcpp/lib/ocloc
${DEFAULT_CMAKE_FLAGS} ${OCLOC_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/ocloc
)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
