Added library linking for cycles_kernel_osl to OSL libraries and added cycles_kernel_osl to the list of blender libs in creator.

intern/cycles/kernel/osl/CMakeLists.txt

@@ -42,3 +42,7 @@ include_directories(${INC})
 add_library(cycles_kernel_osl ${SRC} ${HEADER_SRC})
 
 add_subdirectory(nodes)
+
+if(WITH_CYCLES_OSL)
+	target_link_libraries(cycles_kernel_osl ${OSL_LIBRARIES})
+endif()

source/creator/CMakeLists.txt

@@ -790,6 +790,10 @@ if(WITH_CYCLES)
 		cycles_kernel
 		cycles_util
 		cycles_subd)
+	
+	if(WITH_CYCLES_OSL)
+		list(APPEND BLENDER_LINK_LIBS cycles_kernel_osl)
+	endif()
 endif()
 
 #if(UNIX)
@@ -953,6 +957,10 @@ endif()
 		list(APPEND BLENDER_SORTED_LIBS extern_xdnd)
 	endif()
 
+	if(WITH_CYCLES_OSL)
+		list_insert_after(BLENDER_SORTED_LIBS "cycles_kernel" "cycles_kernel_osl")
+	endif()
+
 	foreach(SORTLIB ${BLENDER_SORTED_LIBS})
 		set(REMLIB ${SORTLIB})
 		foreach(SEARCHLIB ${BLENDER_LINK_LIBS})