diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-08-09 15:32:55 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-08-09 15:32:55 +0400 |
| commit | dd75ec490761640571a0d8e53a0d439091f2736f (patch) | |
| tree | 25b3966862febbf3ee8c81ed45f7045c99f84016 /source/blender/CMakeLists.txt | |
| parent | 02b0967bd11dd6fd2454b37182d9f94ea451b603 (diff) | |
| parent | c026b8066ddc1c42144d2e5132384ea7c1211050 (diff) | |
Merged changes in the trunk up to revision 31190.
Diffstat (limited to 'source/blender/CMakeLists.txt')
| -rw-r--r-- | source/blender/CMakeLists.txt | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 5e1ea753ace..b6a20384b75 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -34,7 +34,6 @@ ADD_SUBDIRECTORY(blenlib) ADD_SUBDIRECTORY(blenloader) ADD_SUBDIRECTORY(blenpluginapi) ADD_SUBDIRECTORY(imbuf) -ADD_SUBDIRECTORY(imbuf/intern/cineon) ADD_SUBDIRECTORY(gpu) ADD_SUBDIRECTORY(makesdna) ADD_SUBDIRECTORY(makesrna) @@ -44,13 +43,17 @@ ADD_SUBDIRECTORY(blenfont) ADD_SUBDIRECTORY(ikplugin) ADD_SUBDIRECTORY(freestyle) -IF(WITH_OPENEXR) +IF(WITH_IMAGE_OPENEXR) ADD_SUBDIRECTORY(imbuf/intern/openexr) -ENDIF(WITH_OPENEXR) +ENDIF(WITH_IMAGE_OPENEXR) -IF(WITH_DDS) +IF(WITH_IMAGE_DDS) ADD_SUBDIRECTORY(imbuf/intern/dds) -ENDIF(WITH_DDS) +ENDIF(WITH_IMAGE_DDS) + +IF(WITH_IMAGE_CINEON) + ADD_SUBDIRECTORY(imbuf/intern/cineon) +ENDIF(WITH_IMAGE_CINEON) IF(WITH_QUICKTIME) ADD_SUBDIRECTORY(quicktime) |