Allow nasm path to be overridden

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

diff --git a/simd/CMakeLists.txt b/simd/CMakeLists.txt
index 5b47d8fe780644da55f4c89d4f864ac8be0f59f4..275a0e5f68f18a37453d14510e95e8f8aea73458 100755 (executable)
--- a/simd/CMakeLists.txt
+++ b/simd/CMakeLists.txt
@@ -1,3 +1,7 @@
+if(NOT DEFINED NASM)\r
+  set(NASM nasm)\r
+endif()\r
+\r
 if(SIMD_X86_64)\r
   set(NAFLAGS -fwin64 -DWIN64 -D__x86_64__ -I${CMAKE_SOURCE_DIR}/win/\r
     -I${CMAKE_CURRENT_SOURCE_DIR}/)\r
@@ -41,7 +45,7 @@ foreach(file ${SIMD_BASENAMES})
   set(SIMD_SRC ${CMAKE_CURRENT_SOURCE_DIR}/${file}.asm)\r
   set(SIMD_OBJ ${OBJDIR}/${file}.obj)\r
   add_custom_command(OUTPUT ${SIMD_OBJ} DEPENDS ${SIMD_SRC} *.inc\r
-    COMMAND nasm ${NAFLAGS} ${SIMD_SRC} -o${SIMD_OBJ})\r
+    COMMAND ${NASM} ${NAFLAGS} ${SIMD_SRC} -o${SIMD_OBJ})\r
   set(SIMD_OBJS ${SIMD_OBJS} ${SIMD_OBJ})\r
 endforeach()\r
 \r