]> granicus.if.org Git - libjpeg-turbo/commitdiff
Fix iOS/ARM[-64] build w/ newer versions of CMake
authorDRC <information@libjpeg-turbo.org>
Tue, 27 Feb 2018 17:36:43 +0000 (11:36 -0600)
committerDRC <information@libjpeg-turbo.org>
Tue, 27 Feb 2018 17:40:05 +0000 (11:40 -0600)
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

simd/CMakeLists.txt

index 82e14ce84931ee0ce743bf97effdf179034a23bc..9a490011b99ad96c178db6996668d011a692e318 100755 (executable)
@@ -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}}")