Bug 1445683 - Do not build aomstats unless examples are enabled; r=chmanchester draft
authorDan Minor <dminor@mozilla.com>
Tue, 26 Jun 2018 09:56:13 -0400
changeset 811438 3c6787d818d99b3f118a28df5188074a3ba765ae
parent 811437 69add47ffe8af2282fa16ad96a2b328564324c22
child 811439 2caa9be65fe1e3a4baa34c617361e9422d5dada0
push id114311
push userbmo:dminor@mozilla.com
push dateWed, 27 Jun 2018 17:15:27 +0000
reviewerschmanchester
bugs1445683
milestone63.0a1
Bug 1445683 - Do not build aomstats unless examples are enabled; r=chmanchester 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. MozReview-Commit-ID: 8CRK3klUPk7
third_party/aom/CMakeLists.txt
--- a/third_party/aom/CMakeLists.txt
+++ b/third_party/aom/CMakeLists.txt
@@ -181,19 +181,21 @@ list(APPEND AOM_ENCODER_APP_UTIL_SOURCES
             "${AOM_ROOT}/common/video_writer.h"
             "${AOM_ROOT}/common/warnings.c"
             "${AOM_ROOT}/common/warnings.h"
             "${AOM_ROOT}/common/y4minput.c"
             "${AOM_ROOT}/common/y4minput.h"
             "${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")
 
 list(APPEND AOM_VERSION_SOURCES "${AOM_CONFIG_DIR}/config/aom_version.h")
 
 list(APPEND AOM_WEBM_DECODER_SOURCES "${AOM_ROOT}/common/webmdec.cc"
             "${AOM_ROOT}/common/webmdec.h")