diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-03-31 11:49:18 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-03-31 16:04:18 +0300 |
| commit | 24fd125893203c667789cb574b289fc1c9eaf6bc (patch) | |
| tree | 2ea2882114789bc0861b3da17979ee35ffd3b4ef | |
| parent | 8204eaea7f07c7fd2784bee2c2cfd495d49877df (diff) | |
| download | rneovim-24fd125893203c667789cb574b289fc1c9eaf6bc.tar.gz rneovim-24fd125893203c667789cb574b289fc1c9eaf6bc.tar.bz2 rneovim-24fd125893203c667789cb574b289fc1c9eaf6bc.zip | |
cmake: Allow failing to download small suppress files
| -rw-r--r-- | cmake/Download.cmake | 12 | ||||
| -rw-r--r-- | src/nvim/CMakeLists.txt | 12 |
2 files changed, 15 insertions, 9 deletions
diff --git a/cmake/Download.cmake b/cmake/Download.cmake index 470bb19a08..50a77816bc 100644 --- a/cmake/Download.cmake +++ b/cmake/Download.cmake @@ -8,9 +8,11 @@ list(GET status 0 status_code) list(GET status 1 status_string) if(NOT status_code EQUAL 0) - message(FATAL_ERROR "error: downloading '${URL}' failed - status_code: ${status_code} - status_string: ${status_string} - log: ${log} -") + if(NOT ALLOW_FAILURE) + message(FATAL_ERROR "error: downloading '${URL}' failed + status_code: ${status_code} + status_string: ${status_string} + log: ${log} + ") + endif() endif() diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index b4bc3afc05..f5f4173879 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -491,21 +491,25 @@ foreach(hfile ${NVIM_HEADERS}) endforeach() add_custom_target(check-single-includes DEPENDS ${HEADER_CHECK_TARGETS}) -function(add_download output url) +function(add_download output url allow_failure) add_custom_command( OUTPUT "${output}" - COMMAND ${CMAKE_COMMAND} -DURL=${url} -DFILE=${output} -P ${DOWNLOAD_SCRIPT} + COMMAND + ${CMAKE_COMMAND} + -DURL=${url} -DFILE=${output} + -DALLOW_FAILURE=${allow_failure} + -P ${DOWNLOAD_SCRIPT} DEPENDS ${DOWNLOAD_SCRIPT} ) endfunction() -add_download(${LINT_SUPPRESS_FILE} ${LINT_SUPPRESS_URL}) +add_download(${LINT_SUPPRESS_FILE} ${LINT_SUPPRESS_URL} off) foreach(sfile ${LINT_NVIM_SOURCES}) get_test_target("" "${sfile}" r suffix) set(suppress_file ${LINT_SUPPRESSES_ROOT}/${suffix}.json) set(suppress_url "${LINT_SUPPRESS_URL_BASE}/${suffix}.json") - add_download(${suppress_file} ${suppress_url}) + add_download(${suppress_file} ${suppress_url} on) set(touch_file "${TOUCHES_DIR}/ran-clint-${suffix}") add_custom_command( OUTPUT ${touch_file} |