diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-03-01 10:16:50 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-03-07 20:07:34 +1000 |
| commit | c4c0f05c69a4d6c1e423e0b217718b99837e2f9c (patch) | |
| tree | 47e55a1f77a94ba95af57b4c3a838ef9b4b7ec61 /cmake/scripts/common | |
| parent | 1c7931aee46f0d4e93bb935ae073fd9936840118 (diff) | |
[cmake] ModuleHelper read BYPRODUCT from VERSION files
Diffstat (limited to 'cmake/scripts/common')
| -rw-r--r-- | cmake/scripts/common/ModuleHelpers.cmake | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cmake/scripts/common/ModuleHelpers.cmake b/cmake/scripts/common/ModuleHelpers.cmake index 188423924d..630a28586c 100644 --- a/cmake/scripts/common/ModuleHelpers.cmake +++ b/cmake/scripts/common/ModuleHelpers.cmake @@ -22,6 +22,7 @@ function(get_archive_name module_name) file(STRINGS ${${UPPER_MODULE_NAME}_FILE} ${UPPER_MODULE_NAME}_VER REGEX "^[ \t]*VERSION=") file(STRINGS ${${UPPER_MODULE_NAME}_FILE} ${UPPER_MODULE_NAME}_ARCHIVE REGEX "^[ \t]*ARCHIVE=") file(STRINGS ${${UPPER_MODULE_NAME}_FILE} ${UPPER_MODULE_NAME}_BASE_URL REGEX "^[ \t]*BASE_URL=") + file(STRINGS ${${UPPER_MODULE_NAME}_FILE} ${UPPER_MODULE_NAME}_BYPRODUCT REGEX "^[ \t]*BYPRODUCT=") # Tarball Hash file(STRINGS ${${UPPER_MODULE_NAME}_FILE} ${UPPER_MODULE_NAME}_HASH_SHA256 REGEX "^[ \t]*SHA256=") @@ -31,6 +32,7 @@ function(get_archive_name module_name) string(REGEX REPLACE ".*VERSION=([^ \t]*).*" "\\1" ${UPPER_MODULE_NAME}_VER "${${UPPER_MODULE_NAME}_VER}") string(REGEX REPLACE ".*ARCHIVE=([^ \t]*).*" "\\1" ${UPPER_MODULE_NAME}_ARCHIVE "${${UPPER_MODULE_NAME}_ARCHIVE}") string(REGEX REPLACE ".*BASE_URL=([^ \t]*).*" "\\1" ${UPPER_MODULE_NAME}_BASE_URL "${${UPPER_MODULE_NAME}_BASE_URL}") + string(REGEX REPLACE ".*BYPRODUCT=([^ \t]*).*" "\\1" ${UPPER_MODULE_NAME}_BYPRODUCT "${${UPPER_MODULE_NAME}_BYPRODUCT}") string(REGEX REPLACE "\\$\\(LIBNAME\\)" "${${UPPER_MODULE_NAME}_LNAME}" ${UPPER_MODULE_NAME}_ARCHIVE "${${UPPER_MODULE_NAME}_ARCHIVE}") string(REGEX REPLACE "\\$\\(VERSION\\)" "${${UPPER_MODULE_NAME}_VER}" ${UPPER_MODULE_NAME}_ARCHIVE "${${UPPER_MODULE_NAME}_ARCHIVE}") @@ -42,13 +44,13 @@ function(get_archive_name module_name) else() set(${UPPER_MODULE_NAME}_BASE_URL "http://mirrors.kodi.tv/build-deps/sources" PARENT_SCOPE) endif() + set(${UPPER_MODULE_NAME}_BYPRODUCT ${${UPPER_MODULE_NAME}_BYPRODUCT} PARENT_SCOPE) if (${UPPER_MODULE_NAME}_HASH_SHA256) set(${UPPER_MODULE_NAME}_HASH ${${UPPER_MODULE_NAME}_HASH_SHA256} PARENT_SCOPE) elseif(${UPPER_MODULE_NAME}_HASH_SHA512) set(${UPPER_MODULE_NAME}_HASH ${${UPPER_MODULE_NAME}_HASH_SHA512} PARENT_SCOPE) endif() - endfunction() # Macro to factor out the repetitive URL setup @@ -103,6 +105,14 @@ macro(BUILD_DEP_TARGET) set(BUILD_IN_SOURCE BUILD_IN_SOURCE ${BUILD_IN_SOURCE}) endif() + if(BUILD_BYPRODUCTS) + set(BUILD_BYPRODUCTS BUILD_BYPRODUCTS ${BUILD_BYPRODUCTS}) + else() + if(${MODULE}_BYPRODUCT) + set(BUILD_BYPRODUCTS BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/${${MODULE}_BYPRODUCT}) + endif() + endif() + externalproject_add(${MODULE_LC} URL ${${MODULE}_URL} URL_HASH ${${MODULE}_HASH} @@ -114,7 +124,7 @@ macro(BUILD_DEP_TARGET) ${CONFIGURE_COMMAND} ${BUILD_COMMAND} ${INSTALL_COMMAND} - BUILD_BYPRODUCTS ${BYPRODUCT} + ${BUILD_BYPRODUCTS} ${BUILD_IN_SOURCE}) set_target_properties(${MODULE_LC} PROPERTIES FOLDER "External Projects") |