[Bf-blender-cvs] [74156ae0ea9] tmp-vfx-platform-2023: Windows: Fix broken OSL shader build
Ray Molenkamp
noreply at git.blender.org
Tue Oct 25 18:40:14 CEST 2022
Commit: 74156ae0ea9cfe718afe260b38eb56393e25c5ad
Author: Ray Molenkamp
Date: Tue Oct 25 10:40:07 2022 -0600
Branches: tmp-vfx-platform-2023
https://developer.blender.org/rB74156ae0ea9cfe718afe260b38eb56393e25c5ad
Windows: Fix broken OSL shader build
some changes in platform/platform_win32.cmake got lost during
one of the master merges.
===================================================================
M build_files/cmake/platform/platform_win32.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 5659c070548..8c645357d6d 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -989,3 +989,10 @@ if(WITH_CYCLES AND WITH_CYCLES_DEVICE_ONEAPI)
list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_sycl_runtime_libraries})
unset(_sycl_runtime_libraries)
endif()
+
+
+# Environment variables to run precompiled executables that needed libraries.
+list(JOIN PLATFORM_BUNDLED_LIBRARY_DIRS ";" _library_paths)
+set(PLATFORM_ENV_BUILD "PATH=${LIBDIR}/OpenImageIO/bin\;${LIBDIR}/boost/lib\;${LIBDIR}/openexr/bin\;${LIBDIR}/imath/bin\;${PATH}")
+set(PLATFORM_ENV_INSTALL "PATH=${CMAKE_INSTALL_PREFIX_WITH_CONFIG}/blender.shared/;$ENV{PATH}")
+unset(_library_paths)
More information about the Bf-blender-cvs
mailing list