diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-11 04:22:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-11 04:22:10 +0400 |
| commit | 32c7e22d3696e3575f4b7d05c1f7140591e88809 (patch) | |
| tree | 44d501cb62aebd638a7f7b5d0306ecc03e0deb5f /source/blender/render/CMakeLists.txt | |
| parent | dfcd01553536d63dab1037d0ea289b9d9d90c39c (diff) | |
| parent | 6fb82a85c9a48c9fad6cb7b42994a9cd7b2b491a (diff) | |
Merged changes in the trunk up to revision 37388.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c
Diffstat (limited to 'source/blender/render/CMakeLists.txt')
| -rw-r--r-- | source/blender/render/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index a05121471e5..02ccac98ee1 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -42,6 +42,10 @@ set(INC ../freestyle ) +set(INC_SYS + +) + set(SRC intern/raytrace/rayobject.cpp intern/raytrace/rayobject_empty.cpp @@ -120,7 +124,8 @@ if(WITH_IMAGE_OPENEXR) endif() if(WITH_CODEC_QUICKTIME) - list(APPEND INC ../quicktime ${QUICKTIME_INC}) + list(APPEND INC ../quicktime) + list(APPEND INC_SYS ${QUICKTIME_INC}) add_definitions(-DWITH_QUICKTIME) endif() @@ -131,4 +136,4 @@ if(APPLE) endif() endif() -blender_add_lib_nolist(bf_render "${SRC}" "${INC}") +blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}") |