Commit: 2835a151c8fbe03a1385662a15caf9ba75347722
Author: Bastien Montagne
Date: Fri Jan 8 19:41:04 2016 +0100
Branches: master
https://developer.blender.org/rB2835a151c8fbe03a1385662a15caf9ba75347722
CMake: Make OSL's .oso shaders building also dependent on OSL compiler!
Otherwise, you can update OSL and not get .oso files regenerated, which is a
quite
funny way to crash Blender...
===================================================================
M intern/cycles/kernel/shaders/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt
b/intern/cycles/kernel/shaders/CMakeLists.txt
index 568ea56..49030f3 100644
--- a/intern/cycles/kernel/shaders/CMakeLists.txt
+++ b/intern/cycles/kernel/shaders/CMakeLists.txt
@@ -103,7 +103,7 @@ foreach(_file ${SRC_OSL})
add_custom_command(
OUTPUT ${_OSO_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
${_OSO_FILE}
)
@@ -112,7 +112,7 @@ foreach(_file ${SRC_OSL})
unset(_OSO_FILE)
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
delayed_install("" "${SRC_OSO}" ${CYCLES_INSTALL_PATH}/shader)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
