diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-04-28 17:47:27 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-04-28 17:47:27 +0400 |
| commit | 774584d7e84843503a5ef4477748cecfdaedeb3d (patch) | |
| tree | 574506474a87223ccfa709113f9048f626071fb1 /intern/cycles/blender/CMakeLists.txt | |
| parent | d263fee9521c2a53f7b673c9a8c57c072bf072c1 (diff) | |
Cycles: hook up the CMake build system.
New build instructions for Ubuntu Linux in the wiki:
http://wiki.blender.org/index.php/Dev:2.5/Source/Cycles
Diffstat (limited to 'intern/cycles/blender/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index a75f7295e31..93a043a54a2 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -32,12 +32,12 @@ INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS}) SET(LIBRARIES - render - bvh - device - kernel - util - subd + cycles_render + cycles_bvh + cycles_device + cycles_kernel + cycles_util + cycles_subd ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${OPENIMAGEIO_LIBRARY} @@ -46,25 +46,25 @@ SET(LIBRARIES ${GLEW_LIBRARIES} ${BLENDER_LIBRARIES}) -IF(WITH_OSL) - LIST(APPEND LIBRARIES kernel_osl ${OSL_LIBRARIES}) -ENDIF(WITH_OSL) +IF(WITH_CYCLES_OSL) + LIST(APPEND LIBRARIES cycles_kernel_osl ${OSL_LIBRARIES}) +ENDIF() -IF(WITH_PARTIO) +IF(WITH_CYCLES_PARTIO) LIST(APPEND LIBRARIES ${PARTIO_LIBRARIES}) -ENDIF(WITH_PARTIO) +ENDIF() -IF(WITH_OPENCL) +IF(WITH_CYCLES_OPENCL) LIST(APPEND LIBRARIES ${OPENCL_LIBRARIES}) -ENDIF(WITH_OPENCL) +ENDIF() SET(CMAKE_MODULE_LINKER_FLAGS ${PYTHON_MODULE_FLAGS}) ADD_LIBRARY(cycles_blender MODULE ${sources} ${headers}) TARGET_LINK_LIBRARIES(cycles_blender ${LIBRARIES}) -INSTALL(FILES ${addonfiles} DESTINATION ${INSTALL_PATH}/cycles) -INSTALL(TARGETS cycles_blender LIBRARY DESTINATION ${INSTALL_PATH}/cycles) +INSTALL(FILES ${addonfiles} DESTINATION ${CYCLES_INSTALL_PATH}/cycles) +INSTALL(TARGETS cycles_blender LIBRARY DESTINATION ${CYCLES_INSTALL_PATH}/cycles) IF(UNIX AND NOT APPLE) SET_TARGET_PROPERTIES(cycles_blender PROPERTIES INSTALL_RPATH $ORIGIN/lib) |