[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50286] trunk/blender/intern/cycles/cmake/ external_libs.cmake: Cycles / OSL:

Thomas Dinges blender at dingto.org
Fri Aug 31 02:21:57 CEST 2012


Revision: 50286
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50286
Author:   dingto
Date:     2012-08-31 00:21:56 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
Cycles / OSL:
* Assume OSL libs in the libdir. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/cmake/external_libs.cmake

Modified: trunk/blender/intern/cycles/cmake/external_libs.cmake
===================================================================
--- trunk/blender/intern/cycles/cmake/external_libs.cmake	2012-08-30 20:45:01 UTC (rev 50285)
+++ trunk/blender/intern/cycles/cmake/external_libs.cmake	2012-08-31 00:21:56 UTC (rev 50286)
@@ -22,7 +22,7 @@
 
 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}")
 




More information about the Bf-blender-cvs mailing list