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

Cycles: fix build issue with Blender includes.

Browse Source
This commit is contained in:
Brecht Van Lommel 2011-05-01 09:19:45 +00:00
parent 774584d7e8
commit e5d7a38a25
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,6 +61,7 @@ ENDIF()
SET(CMAKE_MODULE_LINKER_FLAGS ${PYTHON_MODULE_FLAGS})
ADD_LIBRARY(cycles_blender MODULE ${sources} ${headers})
ADD_DEPENDENCIES(cycles_blender bf_rna)
TARGET_LINK_LIBRARIES(cycles_blender ${LIBRARIES})
INSTALL(FILES ${addonfiles} DESTINATION ${CYCLES_INSTALL_PATH}/cycles)

8
intern/cycles/cmake/external_libs.cmake
View File

@ -119,7 +119,13 @@ ENDIF()
# Blender
IF(WITH_CYCLES_BLENDER)
FIND_PATH(BLENDER_INCLUDE_DIRS RNA_blender.h PATHS ${CMAKE_BINARY_DIR}/include)
# FIND_PATH(BLENDER_INCLUDE_DIRS RNA_blender.h PATHS ${CMAKE_BINARY_DIR}/include)
SET(BLENDER_INCLUDE_DIRS
${CMAKE_SOURCE_DIR}/intern/guardedalloc
${CMAKE_SOURCE_DIR}/source/blender/makesdna
${CMAKE_SOURCE_DIR}/source/blender/makesrna
${CMAKE_SOURCE_DIR}/source/blender/blenloader
${CMAKE_BINARY_DIR}/source/blender/makesrna/intern)
IF(WIN32)
SET(BLENDER_LIBRARIES ${CMAKE_BINARY_DIR}/bin/Release/blender.lib)
ENDIF()

2
intern/cycles/kernel/CMakeLists.txt
View File

@ -103,6 +103,6 @@ INCLUDE_DIRECTORIES(. ../util osl svm)
ADD_LIBRARY(cycles_kernel ${sources} ${headers})
IF(WITH_CYCLES_CUDA)
add_dependencies(cycles_kernel cycles_kernel_cuda)
ADD_DEPENDENCIES(cycles_kernel cycles_kernel_cuda)
ENDIF()