commit 16ad7f543e613f3a01aca40fbc2085a567d98d9a
author Tom Finegan <tomfinegan@google.com> Tue Mar 05 14:09:17 2019 -0800
committer Tom Finegan <tomfinegan@google.com> Tue Mar 05 23:31:35 2019 +0000
tree 0250c4dc40c237c71f4ee9024adb38f3eab58a5b
parent 003149e98533734df249e97b18959324c4cae0b4

cmake: Hook up dsp and scale dependencies in the proper places.

Also deletes an unused CMake function.

Change-Id: I195ab46b07c4aae8a5b6b2ab5adf186d91b52768

aom_dsp/aom_dsp.cmake

diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake
index c6a6e3d..10528d5 100644
--- a/aom_dsp/aom_dsp.cmake
+++ b/aom_dsp/aom_dsp.cmake
@@ -362,6 +362,8 @@
     endif()
   endif()
 
+  target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_dsp>)
+
   # Pass the new lib targets up to the parent scope instance of
   # $AOM_LIB_TARGETS.
   set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} PARENT_SCOPE)

aom_scale/aom_scale.cmake

diff --git a/aom_scale/aom_scale.cmake b/aom_scale/aom_scale.cmake
index 197dea6..3199733 100644
--- a/aom_scale/aom_scale.cmake
+++ b/aom_scale/aom_scale.cmake
@@ -34,5 +34,9 @@
                                   "AOM_SCALE_INTRIN_DSPR2" "aom")
   endif()
 
+  target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_scale>)
+
+  # Pass the new lib targets up to the parent scope instance of
+  # $AOM_LIB_TARGETS.
   set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE)
 endfunction()

av1/av1.cmake

diff --git a/av1/av1.cmake b/av1/av1.cmake
index b6983a4..f594e0a 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -476,13 +476,7 @@
                                   "AOM_AV1_ENCODER_INTRIN_MSA" "aom")
   endif()
 
-  target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_dsp>)
-  target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_scale>)
-
   # Pass the new lib targets up to the parent scope instance of
   # $AOM_LIB_TARGETS.
   set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} PARENT_SCOPE)
 endfunction()
-
-function(setup_av1_test_targets)
-endfunction()