View | Details | Raw Unified | Return to bug 156901 | Differences between
and this patch

Collapse All | Expand All

(-)x11/qimageblitz/files/patch-blitz-CMakeLists.txt (-6 / +8 lines)
Lines 1-13 Link Here
1
Index: blitz/CMakeLists.txt
1
--- blitz/CMakeLists.txt.orig	2010-07-28 20:06:14.000000000 +0200
2
===================================================================
2
+++ blitz/CMakeLists.txt	2011-09-05 01:51:50.000000000 +0200
3
--- blitz/CMakeLists.txt	(revision 1203425)
3
@@ -30,10 +30,11 @@
4
+++ blitz/CMakeLists.txt	(revision 1203426)
4
                    blitzcpu.cpp scale.cpp scalefilter.cpp gradient.cpp)
5
@@ -33,7 +33,7 @@
5
 
6
 if(HAVE_MMX)
7
+    string(REGEX REPLACE "[	 ]+" ";" _CMAKE_C_COMPILER_ARG1 "${CMAKE_C_COMPILER_ARG1}")
6
     if(NOT APPLE AND NOT WIN32)
8
     if(NOT APPLE AND NOT WIN32)
7
         set( blitz_LIB_SRCS ${blitz_LIB_SRCS} asm_scale.S )
9
         set( blitz_LIB_SRCS ${blitz_LIB_SRCS} asm_scale.S )
8
         add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o
10
         add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o
9
-            COMMAND gcc -c ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S
11
-            COMMAND gcc -c ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S
10
+            COMMAND ${CMAKE_C_COMPILER} -c ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S
12
+            COMMAND ${CMAKE_C_COMPILER} ${_CMAKE_C_COMPILER_ARG1} -c ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S
11
             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S )
13
             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S )
12
         set( blitz_LIB_EXTRA_SRCS ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o )
14
         set( blitz_LIB_EXTRA_SRCS ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o )
13
         set(HAVE_EXTERNAL_ASM TRUE)
15
         set(HAVE_EXTERNAL_ASM TRUE)

Return to bug 156901