Cycles: Synchronize changes with standalone repository

This changes were done in original commit of the standalone Cycles repository and needed here for easier patch synchronization.
2014-12-29 14:48:21 +05:00
parent 7f356c20dc
commit 4497b6ac84
8 changed files with 91 additions and 15 deletions
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -120,7 +120,7 @@ if(WITH_CYCLES_OSL)
 	add_definitions(-DOSL_STATIC_LIBRARY)
 	include_directories(
 		SYSTEM
-		${OSL_INCLUDES}
+		${OSL_INCLUDE_DIR}
 	)
 endif()