commit 9c159e55f671cb80b39165255f60e38f349f527c
author Jim Bankoski <jimbankoski@google.com> Tue Nov 14 12:23:35 2017 -0800
committer James Bankoski <jimbankoski@google.com> Wed Nov 15 21:17:38 2017 +0000
tree e8c35e508c00154f0ebf2ffbcba16c55e5bc40b4
parent 749c21a16078adbad81079ef9b4c0784fc670c40

cmake deps problem: EXT_INTRA_MOD & EXT_INTRA & INTRA_EDGE

Fixes cmake dependency problem with ext_intra_mod, ext_intra, and
intraedge.

Change-Id: Id4349e6d35cafbb183a755be038653f060ffdb2f

build/cmake/aom_experiment_deps.cmake

diff --git a/build/cmake/aom_experiment_deps.cmake b/build/cmake/aom_experiment_deps.cmake
index 13f8f2b..fbfa646 100644
--- a/build/cmake/aom_experiment_deps.cmake
+++ b/build/cmake/aom_experiment_deps.cmake
@@ -76,6 +76,15 @@
     endif ()
   endif ()
 
+  if (CONFIG_EXT_INTRA_MOD)
+    if (NOT CONFIG_INTRA_EDGE)
+      change_config_and_warn(CONFIG_INTRA_EDGE 1 CONFIG_EXT_INTRA_MOD)
+    endif ()
+    if (NOT CONFIG_EXT_INTRA)
+      change_config_and_warn(CONFIG_EXT_INTRA 1 CONFIG_EXT_INTRA_MOD)
+    endif ()
+  endif ()
+
   if (CONFIG_EXT_PARTITION_TYPES)
     if (CONFIG_FP_MB_STATS)
       change_config_and_warn(CONFIG_FP_MB_STATS 0 CONFIG_EXT_PARTITION_TYPES)
@@ -107,6 +116,12 @@
     endif ()
   endif ()
 
+  if (CONFIG_INTRA_EDGE)
+    if (NOT CONFIG_EXT_INTRA)
+      change_config_and_warn(CONFIG_EXT_INTRA 1 CONFIG_INTRA_EDGE)
+    endif ()
+  endif ()
+
   if (CONFIG_JNT_COMP)
     if (NOT CONFIG_FRAME_MARKER)
       change_config_and_warn(CONFIG_FRAME_MARKER 1 CONFIG_JNT_COMP)