sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: fix linux build issue, link order was wrong.

Browse Source
This commit is contained in:
Brecht Van Lommel 2011-08-25 12:50:52 +00:00
parent 88481246f0
commit d48e4fc92b
3 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build_files/cmake/macros.cmake
View File

@ -282,12 +282,7 @@ macro(setup_liblinks
target_link_libraries(${target} ${OPENIMAGEIO_LIBRARY})
endif()
if(WITH_BOOST)
if(BOOST_CUSTOM)
set(${boost_libs} ${BOOST_LIBRARIES})
target_link_libraries(${target} ${boost_libs})
else()
target_link_libraries(${target} ${BOOST_LIBRARIES})
endif()
target_link_libraries(${target} ${BOOST_LIBRARIES})
endif()
if(WITH_IMAGE_OPENEXR)
if(WIN32 AND NOT UNIX)

22
intern/cycles/blender/CMakeLists.txt
View File

@ -31,30 +31,8 @@ include_directories(
${PYTHON_INCLUDE_DIRS}
${GLEW_INCLUDE_PATH})
set(LIBRARIES
cycles_render
cycles_bvh
cycles_device
cycles_kernel
cycles_util
cycles_subd)
if(WITH_CYCLES_OSL)
list(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES})
endif()
if(WITH_CYCLES_PARTIO)
list(APPEND LIBRARIES ${PARTIO_LIBRARIES})
endif()
if(WITH_CYCLES_OPENCL)
list(APPEND LIBRARIES ${OPENCL_LIBRARIES})
endif()
blender_add_lib(bf_intern_cycles "${sources}" "" "")
add_dependencies(bf_intern_cycles bf_rna)
target_link_libraries(bf_intern_cycles ${LIBRARIES})
delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${addonfiles}" ${CYCLES_INSTALL_PATH})

22
source/creator/CMakeLists.txt
View File

@ -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})