[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50342] trunk/blender: Added library linking for cycles_kernel_osl to OSL libraries and added cycles_kernel_osl to the list of blender libs in creator .

[Lukas Toenne]

Revision: 50342
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50342
Author:   lukastoenne
Date:     2012-09-03 11:38:18 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Added library linking for cycles_kernel_osl to OSL libraries and added cycles_kernel_osl to the list of blender libs in creator.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt	2012-09-03 11:38:15 UTC (rev 50341)
+++ trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt	2012-09-03 11:38:18 UTC (rev 50342)
@@ -42,3 +42,7 @@
 add_library(cycles_kernel_osl ${SRC} ${HEADER_SRC})
 
 add_subdirectory(nodes)
+
+if(WITH_CYCLES_OSL)
+	target_link_libraries(cycles_kernel_osl ${OSL_LIBRARIES})
+endif()

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2012-09-03 11:38:15 UTC (rev 50341)
+++ trunk/blender/source/creator/CMakeLists.txt	2012-09-03 11:38:18 UTC (rev 50342)
@@ -790,6 +790,10 @@
 		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 @@
 		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})