diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-03 15:38:18 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-03 15:38:18 +0400 |
| commit | c0a3657e7a00f30b5e9d42fd671b1dcf53c465e2 (patch) | |
| tree | cf7341805fe92884ce8ea76edd17a5f107a1776e | |
| parent | 0238d032b2d079dbdf8ae96a1128fc3c2e12f548 (diff) | |
Added library linking for cycles_kernel_osl to OSL libraries and added cycles_kernel_osl to the list of blender libs in creator.
| -rw-r--r-- | intern/cycles/kernel/osl/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/CMakeLists.txt b/intern/cycles/kernel/osl/CMakeLists.txt index 13b2a39d7d0..ce82d901c44 100644 --- a/intern/cycles/kernel/osl/CMakeLists.txt +++ b/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() 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}) |