diff options
author | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
---|---|---|
committer | trav90 <travawine@palemoon.org> | 2018-10-18 21:53:44 -0500 |
commit | ec910d81405c736a4490383a250299a7837c2e64 (patch) | |
tree | 4f27cc226f93a863121aef6c56313e4153a69b3e /third_party/aom/build/cmake/dist.cmake | |
parent | 01eb57073ba97b2d6cbf20f745dfcc508197adc3 (diff) | |
download | UXP-ec910d81405c736a4490383a250299a7837c2e64.tar UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.gz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.lz UXP-ec910d81405c736a4490383a250299a7837c2e64.tar.xz UXP-ec910d81405c736a4490383a250299a7837c2e64.zip |
Update aom to commit id e87fb2378f01103d5d6e477a4ef6892dc714e614
Diffstat (limited to 'third_party/aom/build/cmake/dist.cmake')
-rw-r--r-- | third_party/aom/build/cmake/dist.cmake | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/third_party/aom/build/cmake/dist.cmake b/third_party/aom/build/cmake/dist.cmake index 0de68a44d..ad1e069fe 100644 --- a/third_party/aom/build/cmake/dist.cmake +++ b/third_party/aom/build/cmake/dist.cmake @@ -17,8 +17,8 @@ function (listify_string in_string out_string) set(${out_string} "${${out_string}}" PARENT_SCOPE) endfunction () -set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "AOM_DIST_DIR" "AOM_DIST_EXAMPLES" - "AOM_DIST_APPS" "AOM_DIST_INCLUDES" "AOM_DIST_LIBS" "ENABLE_DOCS") +set(REQUIRED_ARGS "AOM_ROOT" "AOM_CONFIG_DIR" "AOM_DIST_DIR" "AOM_DIST_INCLUDES" + "AOM_DIST_LIBS" "ENABLE_DOCS") foreach (arg ${REQUIRED_ARGS}) if ("${${arg}}" STREQUAL "") @@ -30,15 +30,27 @@ if (ENABLE_DOCS) file(INSTALL "${AOM_CONFIG_DIR}/docs" DESTINATION "${AOM_DIST_DIR}") endif () -listify_string("${AOM_DIST_EXAMPLES}" "AOM_DIST_EXAMPLES") -foreach (example ${AOM_DIST_EXAMPLES}) - file(INSTALL "${example}" DESTINATION "${AOM_DIST_DIR}/bin/examples") -endforeach () +if (AOM_DIST_EXAMPLES) + listify_string("${AOM_DIST_EXAMPLES}" "AOM_DIST_EXAMPLES") + foreach (example ${AOM_DIST_EXAMPLES}) + if (NOT "${example}" MATCHES "aomdec\|aomenc") + file(INSTALL "${example}" DESTINATION "${AOM_DIST_DIR}/bin/examples") + endif () + endforeach () +endif () -listify_string("${AOM_DIST_APPS}" "AOM_DIST_APPS") -foreach (app ${AOM_DIST_APPS}) - file(INSTALL "${app}" DESTINATION "${AOM_DIST_DIR}/bin") -endforeach () +if (AOM_DIST_TOOLS) + foreach (tool ${AOM_DIST_TOOLS}) + file(INSTALL "${tool}" DESTINATION "${AOM_DIST_DIR}/bin/tools") + endforeach () +endif () + +if (AOM_DIST_APPS) + listify_string("${AOM_DIST_APPS}" "AOM_DIST_APPS") + foreach (app ${AOM_DIST_APPS}) + file(INSTALL "${app}" DESTINATION "${AOM_DIST_DIR}/bin") + endforeach () +endif () listify_string("${AOM_DIST_INCLUDES}" "AOM_DIST_INCLUDES") foreach (inc ${AOM_DIST_INCLUDES}) |