From 8490d860d99d33ae4d7301085f3896ca0cc871c9 Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 21:55:15 -0500 Subject: [PATCH] Do not build aomstats unless examples are enabled The aomstats library is only used in the code examples, but we assume that all libraries should be linked into libxul, which leads to an unresolved external dependency on fatal at link time. This adds a guard to only build aomstats if we are building the examples. --- third_party/aom/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/third_party/aom/CMakeLists.txt b/third_party/aom/CMakeLists.txt index 0b445722d1..0f6a37ffbe 100644 --- a/third_party/aom/CMakeLists.txt +++ b/third_party/aom/CMakeLists.txt @@ -186,9 +186,11 @@ list(APPEND AOM_ENCODER_APP_UTIL_SOURCES "${AOM_ROOT}/examples/encoder_util.h" "${AOM_ROOT}/examples/encoder_util.c") -list(APPEND AOM_ENCODER_STATS_SOURCES "${AOM_ROOT}/stats/aomstats.c" - "${AOM_ROOT}/stats/aomstats.h" "${AOM_ROOT}/stats/rate_hist.c" - "${AOM_ROOT}/stats/rate_hist.h") +if (ENABLE_EXAMPLES) + list(APPEND AOM_ENCODER_STATS_SOURCES "${AOM_ROOT}/stats/aomstats.c" + "${AOM_ROOT}/stats/aomstats.h" "${AOM_ROOT}/stats/rate_hist.c" + "${AOM_ROOT}/stats/rate_hist.h") +endif () list(APPEND AOM_PKG_CONFIG_SOURCES "${AOM_CONFIG_DIR}/aom.pc")