diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-08-24 17:21:56 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-08-24 21:21:59 +0300 |
| commit | fbfcc5a544a1dc4c593235d85ae3b98728c7427c (patch) | |
| tree | 0f8912e15ff5e7ab865d4e446799d7addbd7d1b6 /intern/cycles/kernel/osl/shaders | |
| parent | 659bcb3b1023c30e2ce5daa0836f71f52f67c9e6 (diff) | |
Make OpenImageIO and OpenEXR dynamic libraries work on Linux / macOS
I tried to make the mechanism for setting the right environment for oslc and
idiff a bit more generic, hopefully did not break Windows.
Diffstat (limited to 'intern/cycles/kernel/osl/shaders')
| -rw-r--r-- | intern/cycles/kernel/osl/shaders/CMakeLists.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/intern/cycles/kernel/osl/shaders/CMakeLists.txt b/intern/cycles/kernel/osl/shaders/CMakeLists.txt index 3c7e4f6a9c5..f8c0376532f 100644 --- a/intern/cycles/kernel/osl/shaders/CMakeLists.txt +++ b/intern/cycles/kernel/osl/shaders/CMakeLists.txt @@ -121,11 +121,6 @@ set(SRC_OSL_HEADERS set(SRC_OSO ) -if(WIN32) - set(OSLC_ENV ${CMAKE_COMMAND} -E env "PATH=${LIBDIR}/OpenImageIO/bin\;${LIBDIR}/boost/lib\;${LIBDIR}/openexr/bin\;${LIBDIR}/imath/bin\;${PATH}") -else() - set(OSLC_ENV) -endif() # TODO, add a module to compile OSL foreach(_file ${SRC_OSL}) set(_OSL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) @@ -134,7 +129,7 @@ foreach(_file ${SRC_OSL}) string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _OSO_FILE ${_OSO_FILE}) add_custom_command( OUTPUT ${_OSO_FILE} - COMMAND ${OSLC_ENV} ${OSL_COMPILER} -q -O2 -I"${CMAKE_CURRENT_SOURCE_DIR}" -I"${OSL_SHADER_DIR}" -o ${_OSO_FILE} ${_OSL_FILE} + COMMAND ${CMAKE_COMMAND} -E env ${PLATFORM_ENV_BUILD} ${OSL_COMPILER} -q -O2 -I"${CMAKE_CURRENT_SOURCE_DIR}" -I"${OSL_SHADER_DIR}" -o ${_OSO_FILE} ${_OSL_FILE} DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS} ${OSL_COMPILER} ) list(APPEND SRC_OSO |