diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-01 13:19:45 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-05-01 13:19:45 +0400 |
| commit | e5d7a38a257b543ff44e823c29a12198e3817427 (patch) | |
| tree | 1748495dd6a2b8abd096058288e026103b4d23bc | |
| parent | 774584d7e84843503a5ef4477748cecfdaedeb3d (diff) | |
Cycles: fix build issue with Blender includes.
| -rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 8 | ||||
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index 93a043a54a2..096363e5d9f 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -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) diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index da2331cfe9a..e61aee1e582 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -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() diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 6c247a9a645..1f027b40108 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -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() |