From 59e686f1a6a4c67760de23afbeb8282b11c19856 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 25 Oct 2022 20:54:51 -0700 Subject: [PATCH] Add quotes to ${CPUINFO} to defend against spaces. Originally from @autoantwort in https://github.com/microsoft/vcpkg/pull/27412/ --- lib/TH/cmake/FindARM.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/TH/cmake/FindARM.cmake b/lib/TH/cmake/FindARM.cmake index 2dcb2a24..c9205e94 100644 --- a/lib/TH/cmake/FindARM.cmake +++ b/lib/TH/cmake/FindARM.cmake @@ -5,7 +5,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") EXEC_PROGRAM(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO) #neon instruction can be found on the majority part of modern ARM processor - STRING(REGEX REPLACE "^.*(neon).*$" "\\1" NEON_THERE ${CPUINFO}) + STRING(REGEX REPLACE "^.*(neon).*$" "\\1" NEON_THERE "${CPUINFO}") STRING(COMPARE EQUAL "neon" "${NEON_THERE}" NEON_TRUE) IF (NEON_TRUE) set(NEON_FOUND true CACHE BOOL "NEON available on host") @@ -14,7 +14,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") ENDIF (NEON_TRUE) # on ARMv8, neon is inherit and instead listed as 'asimd' in /proc/cpuinfo - STRING(REGEX REPLACE "^.*(asimd).*$" "\\1" ASIMD_THERE ${CPUINFO}) + STRING(REGEX REPLACE "^.*(asimd).*$" "\\1" ASIMD_THERE "${CPUINFO}") STRING(COMPARE EQUAL "asimd" "${ASIMD_THERE}" ASIMD_TRUE) IF (ASIMD_TRUE) set(ASIMD_FOUND true CACHE BOOL "ASIMD/NEON available on host") @@ -23,7 +23,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") ENDIF (ASIMD_TRUE) #Find the processor type (for now OMAP3 or OMAP4) - STRING(REGEX REPLACE "^.*(OMAP3).*$" "\\1" OMAP3_THERE ${CPUINFO}) + STRING(REGEX REPLACE "^.*(OMAP3).*$" "\\1" OMAP3_THERE "${CPUINFO}") STRING(COMPARE EQUAL "OMAP3" "${OMAP3_THERE}" OMAP3_TRUE) IF (OMAP3_TRUE) set(CORTEXA8_FOUND true CACHE BOOL "OMAP3 available on host") @@ -32,7 +32,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux") ENDIF (OMAP3_TRUE) #Find the processor type (for now OMAP3 or OMAP4) - STRING(REGEX REPLACE "^.*(OMAP4).*$" "\\1" OMAP4_THERE ${CPUINFO}) + STRING(REGEX REPLACE "^.*(OMAP4).*$" "\\1" OMAP4_THERE "${CPUINFO}") STRING(COMPARE EQUAL "OMAP4" "${OMAP4_THERE}" OMAP4_TRUE) IF (OMAP4_TRUE) set(CORTEXA9_FOUND true CACHE BOOL "OMAP4 available on host") @@ -45,7 +45,7 @@ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin") CPUINFO) #neon instruction can be found on the majority part of modern ARM processor - STRING(REGEX REPLACE "^.*(neon).*$" "\\1" NEON_THERE ${CPUINFO}) + STRING(REGEX REPLACE "^.*(neon).*$" "\\1" NEON_THERE "${CPUINFO}") STRING(COMPARE EQUAL "neon" "${NEON_THERE}" NEON_TRUE) IF (NEON_TRUE) set(NEON_FOUND true CACHE BOOL "NEON available on host")