diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
| commit | bb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch) | |
| tree | 6fb8da94c6e43098c606f768e722484b04b8645c /source/blender/CMakeLists.txt | |
| parent | 37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff) | |
| parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) | |
merge with trunk at r31523
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 2af347a82a7..29dc113e075 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -35,7 +35,6 @@ ADD_SUBDIRECTORY(bmesh) 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(render) ADD_SUBDIRECTORY(blenfont) ADD_SUBDIRECTORY(ikplugin) -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) |