diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-25 16:50:52 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-25 16:50:52 +0400 |
| commit | d48e4fc92be346810baa8cac595ab0a735882a87 (patch) | |
| tree | c0cede3a981fa30acbfcb1b176017a20a08dfffe /source/creator | |
| parent | 88481246f080c788f7fe85d658f91d2fe44ccae0 (diff) | |
Cycles: fix linux build issue, link order was wrong.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 9e9a1ef7db1..0c5f15c130b 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -729,6 +729,16 @@ if(WITH_MOD_FLUID) list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem) endif() +if(WITH_CYCLES) + list(APPEND BLENDER_LINK_LIBS + cycles_render + cycles_bvh + cycles_device + cycles_kernel + cycles_util + cycles_subd) +endif() + #if(UNIX) # Sort libraries @@ -830,6 +840,14 @@ endif() bf_blenfont bf_intern_audaspace bf_intern_mikktspace + + bf_intern_cycles + cycles_render + cycles_bvh + cycles_device + cycles_kernel + cycles_util + cycles_subd ) if(WITH_MOD_CLOTH_ELTOPO) @@ -856,10 +874,6 @@ endif() list(APPEND BLENDER_SORTED_LIBS bf_quicktime) endif() - if(WITH_CYCLES) - list(APPEND BLENDER_SORTED_LIBS bf_intern_cycles) - endif() - foreach(SORTLIB ${BLENDER_SORTED_LIBS}) set(REMLIB ${SORTLIB}) foreach(SEARCHLIB ${BLENDER_LINK_LIBS}) |