diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-09-11 15:16:55 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-09-11 15:16:55 +0400 |
| commit | fdb4b0c3ed9279473eb0edf4bac0333e7e929727 (patch) | |
| tree | 13ebfc964d5c0588e5c1d67f9b7d00a25a542437 /source/blender/render/CMakeLists.txt | |
| parent | b1da4cfcd8091e2bfc124e1729a89301dbb2164b (diff) | |
| parent | 38669bd5fdf703f94de1884798580e9326e00057 (diff) | |
Merged changes in the trunk up to revision 31880.
Diffstat (limited to 'source/blender/render/CMakeLists.txt')
| -rw-r--r-- | source/blender/render/CMakeLists.txt | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 2e22562e2a3..13e535f0a4e 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -27,15 +27,23 @@ FILE(GLOB SRC intern/source/*.c intern/raytrace/*.cpp) SET(INC - intern/include ../../../intern/guardedalloc ../blenlib ../makesdna - extern/include ../blenkernel ../imbuf - ../include ../../kernel/gen_messaging ../blenloader ../freestyle - ../../../intern/smoke/extern + intern/include + extern/include + ../blenlib + ../blenloader + ../makesdna ../makesrna + ../blenkernel + ../imbuf + ../include + ../../kernel/gen_messaging + ../../../intern/smoke/extern + ../../../intern/guardedalloc + ../freestyle ) IF(WIN32) - SET(INC ${INC} ${PTHREADS_INC}) + LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) IF(WITH_IMAGE_OPENEXR) @@ -43,7 +51,7 @@ IF(WITH_IMAGE_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR) IF(WITH_QUICKTIME) - SET(INC ${INC} ../quicktime ${QUICKTIME_INC}) + LIST(APPEND INC ../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) |