Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Toenne <lukas.toenne@googlemail.com>2012-09-03 15:38:18 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2012-09-03 15:38:18 +0400
commitc0a3657e7a00f30b5e9d42fd671b1dcf53c465e2 (patch)
treecf7341805fe92884ce8ea76edd17a5f107a1776e /source/creator
parent0238d032b2d079dbdf8ae96a1128fc3c2e12f548 (diff)
Added library linking for cycles_kernel_osl to OSL libraries and added cycles_kernel_osl to the list of blender libs in creator.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 26ca390239b..664219f7a93 100644
--- a/source/creator/CMakeLists.txt
+++ b/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})