From 33814e0093f0d8d5d8dca46dfc3a13a39a256227 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 8 Nov 2011 20:27:37 +0000 Subject: edits to cycles cmake files so cmake_consistency_check.py can parse them. --- intern/cycles/blender/CMakeLists.txt | 40 +++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 16 deletions(-) (limited to 'intern/cycles/blender/CMakeLists.txt') diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index a4f290f4abd..f3da1a30eb2 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -1,5 +1,21 @@ -set(sources +set(INC + ../render + ../device + ../kernel + ../kernel/svm + ../util + ../subd +) + +set(INC_SYS + ${BLENDER_INCLUDE_DIRS} + ${PYTHON_INCLUDE_DIRS} + ${GLEW_INCLUDE_PATH} +) + + +set(SRC blender_camera.cpp blender_mesh.cpp blender_object.cpp @@ -10,30 +26,22 @@ set(sources blender_sync.h blender_session.h - blender_util.h) + blender_util.h +) -set(addonfiles +set(ADDON_FILES addon/__init__.py addon/engine.py addon/enums.py addon/presets.py addon/properties.py addon/ui.py - addon/xml.py) + addon/xml.py +) -include_directories( - ../render - ../device - ../kernel - ../kernel/svm - ../util - ../subd - ${BLENDER_INCLUDE_DIRS} - ${PYTHON_INCLUDE_DIRS} - ${GLEW_INCLUDE_PATH}) +blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}") -blender_add_lib(bf_intern_cycles "${sources}" "" "") add_dependencies(bf_intern_cycles bf_rna) -delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${addonfiles}" ${CYCLES_INSTALL_PATH}) +delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${ADDON_FILES}" ${CYCLES_INSTALL_PATH}) -- cgit v1.2.3