Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-10-23 08:05:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-10-23 08:05:55 +0400
commitc6976e7351e448b8ab82757b9e1a665162b0960c (patch)
treea057c5455a6970bca5a10515f361fdd54320b508 /source/blender/imbuf
parent54b3508444d8ae62f8af9d5b9a9ace6c44f95903 (diff)
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.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/CMakeLists.txt32
-rw-r--r--source/blender/imbuf/intern/cineon/CMakeLists.txt13
-rw-r--r--source/blender/imbuf/intern/dds/CMakeLists.txt11
-rw-r--r--source/blender/imbuf/intern/openexr/CMakeLists.txt6
4 files changed, 52 insertions, 10 deletions
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)