projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fd22a56
)
Cycles / OSL:
author
Thomas Dinges <blender@dingto.org>
Fri, 31 Aug 2012 00:21:56 +0000
(
00:21
+0000)
committer
Thomas Dinges <blender@dingto.org>
Fri, 31 Aug 2012 00:21:56 +0000
(
00:21
+0000)
* Assume OSL libs in the libdir.
intern/cycles/cmake/external_libs.cmake
patch
|
blob
|
history
diff --git
a/intern/cycles/cmake/external_libs.cmake
b/intern/cycles/cmake/external_libs.cmake
index 23a919530f9fe4db1cc59e2ad178f0e33d872a28..4f547a5b6448eefeef60bf57c9b0f33016cb7ac8 100644
(file)
--- a/
intern/cycles/cmake/external_libs.cmake
+++ b/
intern/cycles/cmake/external_libs.cmake
@@
-22,7
+22,7
@@
endif()
if(WITH_CYCLES_OSL)
- set(CYCLES_OSL
""
CACHE PATH "Path to OpenShadingLanguage installation")
+ set(CYCLES_OSL
${LIBDIR}/osl
CACHE PATH "Path to OpenShadingLanguage installation")
message(STATUS "CYCLES_OSL = ${CYCLES_OSL}")