forked from bartvdbraak/blender
Cycles: fix build issue with Blender includes.
This commit is contained in:
parent
774584d7e8
commit
e5d7a38a25
@ -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)
|
||||
|
@ -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()
|
||||
|
@ -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()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user