Move aom_scale cmake commands to aom_scale/aom_scale.cmake.

Also, add TODO for rtcd target setup.

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

Change-Id: Ib2e4ecb30f0d2ce9b538986efdb1ac3117bd59df

CMakeLists.txt

@@ -19,6 +19,7 @@ include("${AOM_ROOT}/build/cmake/aom_optimization.cmake")
 include("${AOM_ROOT}/aom_dsp/aom_dsp.cmake")
 include("${AOM_ROOT}/aom_mem/aom_mem.cmake")
 include("${AOM_ROOT}/aom_ports/aom_ports.cmake")
+include("${AOM_ROOT}/aom_scale/aom_scale.cmake")
 include("${AOM_ROOT}/av1/av1.cmake")
 include("${AOM_ROOT}/test/test.cmake")
 
@@ -98,20 +99,11 @@ set(AOM_SOURCES
     "${AOM_ROOT}/aom/src/aom_encoder.c"
     "${AOM_ROOT}/aom/src/aom_image.c")
 
-set(AOM_SCALE_SOURCES
-    "${AOM_ROOT}/aom_scale/aom_scale.h"
-    "${AOM_ROOT}/aom_scale/generic/aom_scale.c"
-    "${AOM_ROOT}/aom_scale/generic/gen_scalers.c"
-    "${AOM_ROOT}/aom_scale/generic/yv12config.c"
-    "${AOM_ROOT}/aom_scale/generic/yv12extend.c"
-    "${AOM_ROOT}/aom_scale/yv12config.h")
-
 set(AOM_UTIL_SOURCES
     "${AOM_ROOT}/aom_util/aom_thread.c"
     "${AOM_ROOT}/aom_util/aom_thread.h"
     "${AOM_ROOT}/aom_util/endian_inl.h")
 
-
 set(AOM_COMMON_APP_UTIL_SOURCES
     "${AOM_ROOT}/args.c"
     "${AOM_ROOT}/args.h"
@@ -156,7 +148,8 @@ set(AOM_WEBM_ENCODER_SOURCES
 include_directories(${AOM_ROOT} ${AOM_CONFIG_DIR})
 
 # Targets
-# TODO(tomfinegan): Add support for enable/disable encoder/decoder.
+# TODO(tomfinegan): Move rtcd target setup where it belongs for each rtcd
+# source.
 add_rtcd_build_step("${AOM_ROOT}/aom_dsp/aom_dsp_rtcd_defs.pl"
                     "${AOM_CONFIG_DIR}/aom_dsp_rtcd.h"
                     "${AOM_ROOT}/aom_dsp/aom_dsp_rtcd.c"
@@ -173,11 +166,9 @@ add_rtcd_build_step("${AOM_ROOT}/av1/common/av1_rtcd_defs.pl"
 add_library(aom_rtcd OBJECT ${AOM_RTCD_SOURCES})
 add_library(aom_util OBJECT ${AOM_UTIL_SOURCES})
 add_library(aom_encoder_stats OBJECT ${AOM_ENCODER_STATS_SOURCES})
-add_library(aom_scale OBJECT ${AOM_SCALE_SOURCES})
 add_library(aom
             ${AOM_SOURCES}
             $<TARGET_OBJECTS:aom_rtcd>
-            $<TARGET_OBJECTS:aom_scale>
             $<TARGET_OBJECTS:aom_util>)
 
 # List of object and static library targets.
@@ -188,6 +179,7 @@ set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_rtcd aom_util aom_encoder_stats
 setup_aom_dsp_targets()
 setup_aom_mem_targets()
 setup_aom_ports_targets()
+setup_aom_scale_targets()
 setup_av1_targets()
 
 # Make all library targets depend on aom_rtcd to make sure it builds first.

aom_scale/aom_scale.cmake

+##
+## Copyright (c) 2017, Alliance for Open Media. All rights reserved
+##
+## This source code is subject to the terms of the BSD 2 Clause License and
+## the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License
+## was not distributed with this source code in the LICENSE file, you can
+## obtain it at www.aomedia.org/license/software. If the Alliance for Open
+## Media Patent License 1.0 was not distributed with this source code in the
+## PATENTS file, you can obtain it at www.aomedia.org/license/patent.
+##
+set(AOM_SCALE_SOURCES
+    "${AOM_ROOT}/aom_scale/aom_scale.h"
+    "${AOM_ROOT}/aom_scale/generic/aom_scale.c"
+    "${AOM_ROOT}/aom_scale/generic/gen_scalers.c"
+    "${AOM_ROOT}/aom_scale/generic/yv12config.c"
+    "${AOM_ROOT}/aom_scale/generic/yv12extend.c"
+    "${AOM_ROOT}/aom_scale/yv12config.h")
+
+# Creates the aom_scale build target and makes libaom depend on it. The libaom
+# target must exist before this function is called.
+function (setup_aom_scale_targets)
+  add_library(aom_scale OBJECT ${AOM_SCALE_SOURCES})
+  set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE)
+  target_sources(aom PUBLIC $<TARGET_OBJECTS:aom_scale>)
+endfunction ()