diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-10-15 20:07:41 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-10-15 20:07:41 +0000 |
| commit | 97c9514451ded4b0fbbce995683e69bd16cbdb2f (patch) | |
| tree | fe26886a63dcbb890a88e45a7491e8bcd471afec /trunk/simd | |
| parent | f28c12e944dbb77aa100c1a6bc48d9670de802ec (diff) | |
Fix dependencies for the color conversion routines, which build other .asm files indirectly
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@265 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/simd')
| -rwxr-xr-x | trunk/simd/CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/trunk/simd/CMakeLists.txt b/trunk/simd/CMakeLists.txt index b40320c..5be325e 100755 --- a/trunk/simd/CMakeLists.txt +++ b/trunk/simd/CMakeLists.txt @@ -42,9 +42,18 @@ else() endif() foreach(file ${SIMD_BASENAMES}) + set(DEPFILE "") set(SIMD_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${file}.asm) + if(${file} MATCHES col) + set(DEPFILE ${SIMD_SRC}) + string(REGEX REPLACE "col" "clr" DEPFILE ${DEPFILE}) + endif() + if(${file} MATCHES mer) + set(DEPFILE ${SIMD_SRC}) + string(REGEX REPLACE "mer" "mrg" DEPFILE ${DEPFILE}) + endif() set(SIMD_OBJ ${OBJDIR}/${file}.obj) - add_custom_command(OUTPUT ${SIMD_OBJ} DEPENDS ${SIMD_SRC} *.inc + add_custom_command(OUTPUT ${SIMD_OBJ} DEPENDS ${SIMD_SRC} ${DEPFILE} *.inc COMMAND ${NASM} ${NAFLAGS} ${SIMD_SRC} -o${SIMD_OBJ}) set(SIMD_OBJS ${SIMD_OBJS} ${SIMD_OBJ}) endforeach() |