From: DRC <information@libjpeg-turbo.org>
Date: Tue, 27 Feb 2018 17:36:43 +0000 (-0600)
Subject: Fix iOS/ARM[-64] build w/ newer versions of CMake
X-Git-Tag: 1.5.90~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c54642;p=libjpeg-turbo

Fix iOS/ARM[-64] build w/ newer versions of CMake

Newer versions of CMake (known to be the case with 3.7.x and 3.10.x)
fail to add a space between CMAKE_C_FLAGS and CMAKE_ASM_FLAGS, which
causes the build to fail when using the official build procedure.

Closes #216
---

diff --git a/simd/CMakeLists.txt b/simd/CMakeLists.txt
index 82e14ce..9a49001 100755
--- a/simd/CMakeLists.txt
+++ b/simd/CMakeLists.txt
@@ -202,7 +202,7 @@ elseif(CPU_TYPE STREQUAL "arm64" OR CPU_TYPE STREQUAL "arm")
 
 enable_language(ASM)
 
-set(CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS}${CMAKE_ASM_FLAGS})
+set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_ASM_FLAGS}")
 
 string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UC)
 set(EFFECTIVE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE_UC}}")