diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2017-02-04 18:20:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-04 18:20:10 +0100 |
| commit | 7781e47f997b2b100957c0eee2622df7346eb0e5 (patch) | |
| tree | 3b2f711fffdee9a8baa64bd50b214bc4013de507 | |
| parent | 9e73395c619cea0e3c9d209861b5a3c7c9801747 (diff) | |
| parent | f0ab7c8921cbbad7426bf08e4ca59da2a2e60cff (diff) | |
Merge pull request #11566 from Rechi/fixCmakeBinaryAddonsKrypton
[cmake] don't abort building binary addons if an addon cannot be downloaded
| -rw-r--r-- | project/cmake/addons/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/project/cmake/addons/CMakeLists.txt b/project/cmake/addons/CMakeLists.txt index 96e544bb44..99152a7ec2 100644 --- a/project/cmake/addons/CMakeLists.txt +++ b/project/cmake/addons/CMakeLists.txt @@ -327,7 +327,12 @@ foreach(addon ${addons}) file(DOWNLOAD "${url}" "${BUILD_DIR}/download/${archive_name}.tar.gz" STATUS dlstatus LOG dllog SHOW_PROGRESS) list(GET dlstatus 0 retcode) if(NOT ${retcode} EQUAL 0) - message(FATAL_ERROR "ERROR downloading ${url} - status: ${dlstatus} log: ${dllog}") + file(REMOVE ${BUILD_DIR}/download/${archive_name}.tar.gz) + message(STATUS "ERROR downloading ${url} - status: ${dlstatus} log: ${dllog}") + # add a dummy target for addons to get it in addons failure file + list(APPEND ALL_ADDONS_BUILDING ${id}) + add_custom_target(${id} COMMAND ${CMAKE_COMMAND} -E echo "IGNORED ${id} - download failed" COMMAND exit 1) + continue() endif() endif() |