[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36407] branches/cycles/intern/cycles: Cycles: fix build issue with Blender includes.

[Brecht Van Lommel]

Revision: 36407
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36407
Author:   blendix
Date:     2011-05-01 09:19:45 +0000 (Sun, 01 May 2011)
Log Message:
-----------
Cycles: fix build issue with Blender includes.

Modified Paths:
--------------
    branches/cycles/intern/cycles/blender/CMakeLists.txt
    branches/cycles/intern/cycles/cmake/external_libs.cmake
    branches/cycles/intern/cycles/kernel/CMakeLists.txt

Modified: branches/cycles/intern/cycles/blender/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/blender/CMakeLists.txt        2011-05-01 
08:52:33 UTC (rev 36406)
+++ branches/cycles/intern/cycles/blender/CMakeLists.txt        2011-05-01 
09:19:45 UTC (rev 36407)
@@ -61,6 +61,7 @@
 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)

Modified: branches/cycles/intern/cycles/cmake/external_libs.cmake
===================================================================
--- branches/cycles/intern/cycles/cmake/external_libs.cmake     2011-05-01 
08:52:33 UTC (rev 36406)
+++ branches/cycles/intern/cycles/cmake/external_libs.cmake     2011-05-01 
09:19:45 UTC (rev 36407)
@@ -119,7 +119,13 @@
 # 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()

Modified: branches/cycles/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/kernel/CMakeLists.txt 2011-05-01 08:52:33 UTC 
(rev 36406)
+++ branches/cycles/intern/cycles/kernel/CMakeLists.txt 2011-05-01 09:19:45 UTC 
(rev 36407)
@@ -103,6 +103,6 @@
 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()
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs