From: DRC <dcommander@users.sourceforge.net>
Date: Tue, 7 Aug 2012 21:59:59 +0000 (+0000)
Subject: Fix build issues that occurred whenever	the source directory contained the letters... 
X-Git-Tag: 1.2.90~49^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29d8f253f84e678d7f475a5418bfcd41b7baf74f;p=libjpeg-turbo

Fix build issues that occurred whenever	the source directory contained the letters "col", "mer", or "gra".


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.2.x@860 632fc199-4ca6-4c93-a231-07263d6284db
---

diff --git a/simd/CMakeLists.txt b/simd/CMakeLists.txt
index 06bbae4..fc2ce99 100755
--- a/simd/CMakeLists.txt
+++ b/simd/CMakeLists.txt
@@ -43,16 +43,19 @@ foreach(file ${SIMD_BASENAMES})
   set(DEPFILE "")
   set(SIMD_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${file}.asm)
   if(${file} MATCHES col)
-    set(DEPFILE ${SIMD_SRC})
+    set(DEPFILE ${file})
     string(REGEX REPLACE "col" "clr" DEPFILE ${DEPFILE})
+    set(DEPFILE ${CMAKE_CURRENT_SOURCE_DIR}/${DEPFILE}.asm)
   endif()
   if(${file} MATCHES mer)
-    set(DEPFILE ${SIMD_SRC})
+    set(DEPFILE ${file})
     string(REGEX REPLACE "mer" "mrg" DEPFILE ${DEPFILE})
+    set(DEPFILE ${CMAKE_CURRENT_SOURCE_DIR}/${DEPFILE}.asm)
   endif()
   if(${file} MATCHES gra)
-    set(DEPFILE ${SIMD_SRC})
+    set(DEPFILE ${file})
     string(REGEX REPLACE "gra" "gry" DEPFILE ${DEPFILE})
+    set(DEPFILE ${CMAKE_CURRENT_SOURCE_DIR}/${DEPFILE}.asm)
   endif()
   set(SIMD_OBJ ${OBJDIR}/${file}.obj)
   add_custom_command(OUTPUT ${SIMD_OBJ}