commit 665e05dbf56c91f45f9784523be9b3d6223cd5e3
author Tom Finegan <tomfinegan@google.com> Mon Aug 07 17:57:34 2017 -0700
committer Tom Finegan <tomfinegan@google.com> Tue Aug 08 15:56:29 2017 +0000
tree eb1268fd77a2ba70181c37e3b7a397b1c43c2657
parent e1b2ea156347177020049d96df5ccf0a9c09ec3e

Fix CONFIG_FILTER_INTRA builds with CMake.

Omit filterintra_predictors_test.cc from the build to mimic
configure behavior.

BUG=aomedia:683

Change-Id: I2057b25f5cf69ed1434a3e3833d7c30072a0b811

test/test.cmake

diff --git a/test/test.cmake b/test/test.cmake
index b78715e..b73feb6 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -143,13 +143,15 @@
           "${AOM_ROOT}/test/dering_test.cc")
     endif ()
 
-    if (CONFIG_FILTER_INTRA)
-      if (HAVE_SSE4_1)
-        set(AOM_UNIT_TEST_COMMON_SOURCES
-            ${AOM_UNIT_TEST_COMMON_SOURCES}
-            "${AOM_ROOT}/test/filterintra_predictors_test.cc")
-      endif ()
-    endif ()
+    # Omit 4-tap filter intra predictor test-- currently a 3-tap filter is in
+    # use.
+    #if (CONFIG_FILTER_INTRA)
+    #  if (HAVE_SSE4_1)
+    #    set(AOM_UNIT_TEST_COMMON_SOURCES
+    #        ${AOM_UNIT_TEST_COMMON_SOURCES}
+    #        "${AOM_ROOT}/test/filterintra_predictors_test.cc")
+    #  endif ()
+    #endif ()
 
     if (CONFIG_INTRABC)
         set(AOM_UNIT_TEST_COMMON_SOURCES