commit 9d9009757da49f4b9a192f2f53ce0245d46117e6
author Tom Finegan <tomfinegan@google.com> Fri May 05 12:41:20 2017 -0700
committer Tom Finegan <tomfinegan@google.com> Mon May 08 16:20:19 2017 +0000
tree 6866958de6f961ae2cb7ebc7a2f463c43a50f738
parent 03013c53ed8dbfdeaa3856d35b02c08e140dd94d

Support CONFIG_GLOBAL_MOTION in the CMake build.

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

Change-Id: Ia56bdc8da422e9de9b92f357c98ad38017e8b728

av1/av1.cmake

diff --git a/av1/av1.cmake b/av1/av1.cmake
index f45206f..cc2716f 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -291,6 +291,23 @@
       "${AOM_ROOT}/av1/decoder/accounting.h")
 endif ()
 
+if (CONFIG_GLOBAL_MOTION)
+  set(AOM_AV1_ENCODER_SOURCES
+      ${AOM_AV1_ENCODER_SOURCES}
+      "${AOM_ROOT}/av1/encoder/corner_detect.c"
+      "${AOM_ROOT}/av1/encoder/corner_detect.h"
+      "${AOM_ROOT}/av1/encoder/corner_match.c"
+      "${AOM_ROOT}/av1/encoder/corner_match.h"
+      "${AOM_ROOT}/av1/encoder/global_motion.c"
+      "${AOM_ROOT}/av1/encoder/global_motion.h"
+      "${AOM_ROOT}/av1/encoder/ransac.c"
+      "${AOM_ROOT}/av1/encoder/ransac.h"
+      "${AOM_ROOT}/third_party/fastfeat/fast_9.c"
+      "${AOM_ROOT}/third_party/fastfeat/fast.c"
+      "${AOM_ROOT}/third_party/fastfeat/fast.h"
+      "${AOM_ROOT}/third_party/fastfeat/nonmax.c")
+endif ()
+
 if (CONFIG_INSPECTION)
   set(AOM_AV1_DECODER_SOURCES
       ${AOM_AV1_DECODER_SOURCES}
@@ -390,13 +407,13 @@
       ${AOM_AV1_COMMON_INTRIN_SSE2}
       "${AOM_ROOT}/av1/common/x86/warp_plane_sse2.c")
 
-  set(AOM_AV1_COMMON_SSSE3_INTRIN
-      ${AOM_AV1_COMMON_SSSE3_INTRIN}
+  set(AOM_AV1_COMMON_INTRIN_SSSE3
+      ${AOM_AV1_COMMON_INTRIN_SSSE3}
       "${AOM_ROOT}/av1/common/x86/warp_plane_ssse3.c")
 
   if (CONFIG_HIGHBITDEPTH)
-    set(AOM_AV1_COMMON_SSSE3_INTRIN
-        ${AOM_AV1_COMMON_SSSE3_INTRIN}
+    set(AOM_AV1_COMMON_INTRIN_SSSE3
+        ${AOM_AV1_COMMON_INTRIN_SSSE3}
         "${AOM_ROOT}/av1/common/x86/highbd_warp_plane_ssse3.c")
   endif ()
 endif ()