From 5abae0a761e59235a17c47612e34a521c658bd3c Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Mon, 27 Feb 2017 14:03:03 -0800 Subject: [PATCH] Move aom_dsp.cmake lib list updates into setup_aom_dsp_targets(). Change-Id: I5eb53ef88fb136bf8e06aa2cdc2c1feae9bec956 --- aom_dsp/aom_dsp.cmake | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/aom_dsp/aom_dsp.cmake b/aom_dsp/aom_dsp.cmake index 878f4f988..db25df176 100644 --- a/aom_dsp/aom_dsp.cmake +++ b/aom_dsp/aom_dsp.cmake @@ -272,28 +272,22 @@ if (CONFIG_MOTION_VAR) "${AOM_ROOT}/aom_dsp/x86/obmc_variance_sse4.c") endif () -set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_dsp_common) - -if (CONFIG_DECODERS) - set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_dsp_decoder) -endif () -if (CONFIG_ENCODERS) - set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_dsp_encoder) -endif () - # Creates aom_dsp build targets. Must not be called until after libaom target # has been created. function (setup_aom_dsp_targets) add_library(aom_dsp_common OBJECT ${AOM_DSP_COMMON_SOURCES}) + set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_dsp_common) target_sources(aom PUBLIC $) if (CONFIG_DECODERS) add_library(aom_dsp_decoder OBJECT ${AOM_DSP_DECODER_SOURCES}) + set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_dsp_decoder) target_sources(aom PUBLIC $) endif () if (CONFIG_ENCODERS) add_library(aom_dsp_encoder OBJECT ${AOM_DSP_ENCODER_SOURCES}) + set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_dsp_encoder) target_sources(aom PUBLIC $) endif ()