diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-07-21 03:33:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-07-21 03:33:10 +0400 |
| commit | ce03ec4b866a3e1a6f19a266bf2c38c2c4b4afd0 (patch) | |
| tree | c25f25286bde21fa170dc4a8582a12c19388f4e7 /source/blender/editors/render/CMakeLists.txt | |
| parent | 4c3140004aa61169061ddd2628a4f2c8d88f46a1 (diff) | |
| parent | 76e91d7a5f8c253543bd1c938c8e74872d7a6c81 (diff) | |
Merged changes in the trunk up to revision 38543.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
Diffstat (limited to 'source/blender/editors/render/CMakeLists.txt')
| -rw-r--r-- | source/blender/editors/render/CMakeLists.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 64420546153..39c36326c0a 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -52,8 +52,12 @@ set(SRC ) if(WITH_CODEC_QUICKTIME) - list(APPEND INC ../../quicktime) - list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS}) + list(APPEND INC + ../../quicktime + ) + list(APPEND INC_SYS + ${QUICKTIME_INCLUDE_DIRS} + ) add_definitions(-DWITH_QUICKTIME) endif() @@ -61,4 +65,8 @@ if(WITH_OPENMP) add_definitions(-DPARALLEL=1) endif() +if(WITH_HEADLESS) + add_definitions(-DWITH_HEADLESS) +endif() + blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}") |