commit 5b29d8de992e92d48959feb39ea0f306dca5dac4
author Tom Finegan <tomfinegan@google.com> Thu Jan 19 09:15:13 2017 -0800
committer Tom Finegan <tomfinegan@google.com> Thu Jan 19 23:30:47 2017 +0000
tree 98b47e1aa7d7fed57784e4cc0ca4823aeeaad3f5
parent 2e6048874c6a6871b5bd92c21c157d7305773fe0

Fix cmake build.

Add CONFIG_UNPOISON_PARTITION_CTX to cmake configuration. Also, remove
deleted file from CMakeLists.txt.

BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=76

Change-Id: Ic26c19c0a12d638eebe94fd1eecda4a3e6c85bfc

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10ebfc1..a94a1eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,6 @@
     "${AOM_ROOT}/aom_dsp/aom_dsp_rtcd.c"
     "${AOM_CONFIG_DIR}/aom_dsp_rtcd.h"
     "${AOM_ROOT}/aom_dsp/aom_filter.h"
-    "${AOM_ROOT}/aom_dsp/aom_simd.c"
     "${AOM_ROOT}/aom_dsp/aom_simd.h"
     "${AOM_ROOT}/aom_dsp/aom_simd_inline.h"
     "${AOM_ROOT}/aom_dsp/avg.c"

build/cmake/aom_config.h.cmake

diff --git a/build/cmake/aom_config.h.cmake b/build/cmake/aom_config.h.cmake
index 377f790..6e8651b 100644
--- a/build/cmake/aom_config.h.cmake
+++ b/build/cmake/aom_config.h.cmake
@@ -114,6 +114,7 @@
 #define CONFIG_LOOP_RESTORATION ${CONFIG_LOOP_RESTORATION}
 #define CONFIG_EXT_PARTITION ${CONFIG_EXT_PARTITION}
 #define CONFIG_EXT_PARTITION_TYPES ${CONFIG_EXT_PARTITION_TYPES}
+#define CONFIG_UNPOISON_PARTITION_CTX ${CONFIG_UNPOISON_PARTITION_CTX}
 #define CONFIG_EXT_TILE ${CONFIG_EXT_TILE}
 #define CONFIG_MOTION_VAR ${CONFIG_MOTION_VAR}
 #define CONFIG_WARPED_MOTION ${CONFIG_WARPED_MOTION}

build/cmake/aom_config_defaults.cmake

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 0755b57..50639ee 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -114,6 +114,7 @@
 set(CONFIG_LOOP_RESTORATION 0 CACHE BOOL "Internal flag.")
 set(CONFIG_EXT_PARTITION 0 CACHE BOOL "Internal flag.")
 set(CONFIG_EXT_PARTITION_TYPES 0 CACHE BOOL "Internal flag.")
+set(CONFIG_UNPOISON_PARTITION_CTX 0 CACHE BOOL "Internal flag.")
 set(CONFIG_EXT_TILE 0 CACHE BOOL "Internal flag.")
 set(CONFIG_MOTION_VAR 0 CACHE BOOL "Internal flag.")
 set(CONFIG_WARPED_MOTION 0 CACHE BOOL "Internal flag.")