Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake: Make OSL's .oso shaders building also dependent on OSL compiler!

Browse Source 
Otherwise, you can update OSL and not get .oso files regenerated, which is a quite
funny way to crash Blender...
This commit is contained in:
Bastien Montagne
2016-01-08 19:41:04 +01:00
parent c7ea7e4c9a
commit 2835a151c8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/shaders/CMakeLists.txt
View File

@@ -103,7 +103,7 @@ foreach(_file ${SRC_OSL})
add_custom_command( add_custom_command(
OUTPUT ${_OSO_FILE} OUTPUT ${_OSO_FILE}
COMMAND ${OSL_COMPILER} -q -O2 -I"${CMAKE_CURRENT_SOURCE_DIR}" -o ${_OSO_FILE} ${_OSL_FILE} COMMAND ${OSL_COMPILER} -q -O2 -I"${CMAKE_CURRENT_SOURCE_DIR}" -o ${_OSO_FILE} ${_OSL_FILE}
DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS}) DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS} ${OSL_COMPILER})
list(APPEND SRC_OSO list(APPEND SRC_OSO
${_OSO_FILE} ${_OSO_FILE}
) )
@@ -112,7 +112,7 @@ foreach(_file ${SRC_OSL})
unset(_OSO_FILE) unset(_OSO_FILE)
endforeach() endforeach()
add_custom_target(cycles_osl_shaders ALL DEPENDS ${SRC_OSO} ${SRC_OSL_HEADERS}) add_custom_target(cycles_osl_shaders ALL DEPENDS ${SRC_OSO} ${SRC_OSL_HEADERS} ${OSL_COMPILER})
# CMAKE_CURRENT_SOURCE_DIR is already included in OSO paths # CMAKE_CURRENT_SOURCE_DIR is already included in OSO paths
delayed_install("" "${SRC_OSO}" ${CYCLES_INSTALL_PATH}/shader) delayed_install("" "${SRC_OSO}" ${CYCLES_INSTALL_PATH}/shader)