From 7369c7d7a5eed32963d8af37658286617919f91c Mon Sep 17 00:00:00 2001 From: trav90 Date: Thu, 18 Oct 2018 06:04:57 -0500 Subject: Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918 --- third_party/aom/build/cmake/toolchains/arm-ios-common.cmake | 2 +- third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake | 2 +- third_party/aom/build/cmake/toolchains/armv7-ios.cmake | 2 +- third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake | 2 +- third_party/aom/build/cmake/toolchains/armv7s-ios.cmake | 2 +- third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake | 2 +- third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake | 2 +- third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake | 2 +- third_party/aom/build/cmake/toolchains/x86-macos.cmake | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'third_party/aom/build/cmake/toolchains') diff --git a/third_party/aom/build/cmake/toolchains/arm-ios-common.cmake b/third_party/aom/build/cmake/toolchains/arm-ios-common.cmake index 8317ae272..8929f3b1d 100644 --- a/third_party/aom/build/cmake/toolchains/arm-ios-common.cmake +++ b/third_party/aom/build/cmake/toolchains/arm-ios-common.cmake @@ -24,7 +24,7 @@ set(AOM_ADS2GAS "${CMAKE_CURRENT_SOURCE_DIR}/build/make/ads2gas_apple.pl") set(AOM_GAS_EXT "S") # No runtime cpu detect for arm*-ios targets. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE BOOL "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") # TODO(tomfinegan): Handle bit code embedding. diff --git a/third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake b/third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake index b8efe6be6..303f1cf9a 100644 --- a/third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake +++ b/third_party/aom/build/cmake/toolchains/arm64-linux-gcc.cmake @@ -30,6 +30,6 @@ set(CMAKE_SYSTEM_PROCESSOR "arm64") set(AOM_NEON_INTRIN_FLAG "") # No runtime cpu detect for arm64-linux-gcc. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE BOOL "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARM64_LINUX_GCC_CMAKE_ diff --git a/third_party/aom/build/cmake/toolchains/armv7-ios.cmake b/third_party/aom/build/cmake/toolchains/armv7-ios.cmake index 71ac4067c..c1e72ce3d 100644 --- a/third_party/aom/build/cmake/toolchains/armv7-ios.cmake +++ b/third_party/aom/build/cmake/toolchains/armv7-ios.cmake @@ -25,6 +25,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/arm-ios-common.cmake") set(AOM_NEON_INTRIN_FLAG "") # No runtime cpu detect for armv7s-ios. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE BOOL "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_IOS_CMAKE_ diff --git a/third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake b/third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake index eedfda464..13a737784 100644 --- a/third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake +++ b/third_party/aom/build/cmake/toolchains/armv7-linux-gcc.cmake @@ -43,6 +43,6 @@ set(AOM_ADS2GAS "${CMAKE_CURRENT_SOURCE_DIR}/build/make/ads2gas.pl") set(AOM_GAS_EXT "S") # No runtime cpu detect for armv7-linux-gcc. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE BOOL "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7_LINUX_GCC_CMAKE_ diff --git a/third_party/aom/build/cmake/toolchains/armv7s-ios.cmake b/third_party/aom/build/cmake/toolchains/armv7s-ios.cmake index 99e1dc39c..bdb627c78 100644 --- a/third_party/aom/build/cmake/toolchains/armv7s-ios.cmake +++ b/third_party/aom/build/cmake/toolchains/armv7s-ios.cmake @@ -25,6 +25,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/arm-ios-common.cmake") set(AOM_NEON_INTRIN_FLAG "") # No runtime cpu detect for armv7s-ios. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE BOOL "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") endif () # AOM_BUILD_CMAKE_TOOLCHAINS_ARMV7S_IOS_CMAKE_ diff --git a/third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake b/third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake index a55c41115..11406bd08 100644 --- a/third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake +++ b/third_party/aom/build/cmake/toolchains/mips32-linux-gcc.cmake @@ -66,6 +66,6 @@ set(CMAKE_CXX_COMPILER_ARG1 "-EL ${MIPS_CXXFLAGS}") set(CMAKE_SYSTEM_PROCESSOR "mips32") # No runtime cpu detect for mips32-linux-gcc. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE BOOL "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") endif () # AOM_BUILD_CMAKE_TOOLCHAINS_MIPS32_LINUX_GCC_CMAKE_ diff --git a/third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake b/third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake index 28b1582cc..fffb495bf 100644 --- a/third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake +++ b/third_party/aom/build/cmake/toolchains/mips64-linux-gcc.cmake @@ -43,6 +43,6 @@ set(CMAKE_CXX_COMPILER_ARG1 "-EL ${MIPS_CXXFLAGS}") set(CMAKE_SYSTEM_PROCESSOR "mips64") # No runtime cpu detect for mips64-linux-gcc. -set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE BOOL "") +set(CONFIG_RUNTIME_CPU_DETECT 0 CACHE NUMBER "") endif () # AOM_BUILD_CMAKE_TOOLCHAINS_MIPS64_LINUX_GCC_CMAKE_ diff --git a/third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake b/third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake index 4e4ebc034..295156c3d 100644 --- a/third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake +++ b/third_party/aom/build/cmake/toolchains/x86-ios-simulator.cmake @@ -20,7 +20,7 @@ set(CMAKE_SYSTEM_PROCESSOR "i386") set(CMAKE_OSX_ARCHITECTURES "i386") # Avoid noisy PIC/PIE warnings. -set(CONFIG_PIC 1 CACHE BOOL "") +set(CONFIG_PIC 1 CACHE NUMBER "") include("${CMAKE_CURRENT_LIST_DIR}/ios-simulator-common.cmake") diff --git a/third_party/aom/build/cmake/toolchains/x86-macos.cmake b/third_party/aom/build/cmake/toolchains/x86-macos.cmake index 22d0171a7..c9cab3d5b 100644 --- a/third_party/aom/build/cmake/toolchains/x86-macos.cmake +++ b/third_party/aom/build/cmake/toolchains/x86-macos.cmake @@ -15,4 +15,4 @@ set(CMAKE_C_COMPILER_ARG1 "-arch i386") set(CMAKE_CXX_COMPILER_ARG1 "-arch i386") # Apple tools always complain in 32 bit mode without PIC. -set(CONFIG_PIC 1 CACHE STRING "") +set(CONFIG_PIC 1 CACHE NUMBER "") -- cgit v1.2.3