From c6976e7351e448b8ab82757b9e1a665162b0960c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 23 Oct 2010 04:05:55 +0000 Subject: use explicit file paths for CMake rather then globing, This is recommended by cmake devs. globbing vs explicit is discussed here. http://www.cmake.org/pipermail/cmake/2008-December/025694.html Practical implications are: - developers need to keep CMakeLists.txt files up to date. - Users wont get strange linking errors if they build after a file is added, since CMake detects CMakeLists.txt is modified and automatically reconfigure. --- source/blender/imbuf/CMakeLists.txt | 32 ++++++++++++++++++++-- source/blender/imbuf/intern/cineon/CMakeLists.txt | 13 +++++++-- source/blender/imbuf/intern/dds/CMakeLists.txt | 11 ++++++-- source/blender/imbuf/intern/openexr/CMakeLists.txt | 6 ++-- 4 files changed, 52 insertions(+), 10 deletions(-) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 699ed6e1b00..f89ef033d78 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -24,9 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC intern/*.c) - - SET(INC . ../avi @@ -40,6 +37,35 @@ SET(INC ${ZLIB_INC} ) +SET(SRC + intern/allocimbuf.c + intern/anim_movie.c + intern/bmp.c + intern/cache.c + intern/divers.c + intern/filetype.c + intern/filter.c + intern/imageprocess.c + intern/iris.c + intern/jp2.c + intern/jpeg.c + intern/md5.c + intern/metadata.c + intern/module.c + intern/png.c + intern/radiance_hdr.c + intern/readimage.c + intern/rectop.c + intern/rotate.c + intern/scaling.c + intern/targa.c + intern/thumbs.c + intern/thumbs_blend.c + intern/tiff.c + intern/util.c + intern/writeimage.c +) + IF(WIN32) LIST(APPEND INC ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index 5633d2a66f6..a39235b20ec 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -24,17 +24,24 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.c) - SET(INC . + intern/include .. ../../ - intern/include ../../../blenkernel ../../../blenlib ../../../makesdna ../../../../../intern/guardedalloc ) +SET(SRC + cineon_dpx.c + cineonlib.c + dpxlib.c + logImageCore.c + logImageLib.c + logmemfile.c +) + BLENDERLIB(bf_cineon "${SRC}" "${INC}") diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt index 620d4041703..78513b35b87 100644 --- a/source/blender/imbuf/intern/dds/CMakeLists.txt +++ b/source/blender/imbuf/intern/dds/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE (GLOB SRC *.cpp) - SET(INC . .. @@ -37,6 +35,15 @@ SET(INC ../../../../../intern/guardedalloc ) +SET(SRC + BlockDXT.cpp + ColorBlock.cpp + DirectDrawSurface.cpp + Image.cpp + Stream.cpp + dds_api.cpp +) + if(WITH_IMAGE_DDS) ADD_DEFINITIONS(-DWITH_DDS) ENDIF(WITH_IMAGE_DDS) diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt index cfc977ff155..836958f4b09 100644 --- a/source/blender/imbuf/intern/openexr/CMakeLists.txt +++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt @@ -24,8 +24,6 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC openexr_api.cpp) - SET(INC . ../../../blenkernel @@ -38,6 +36,10 @@ SET(INC ${OPENEXR_INC} ) +SET(SRC + openexr_api.cpp +) + IF(WITH_IMAGE_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR) ENDIF(WITH_IMAGE_OPENEXR) -- cgit v1.2.3