diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/log4cplus | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/log4cplus')
| -rw-r--r-- | ports/log4cplus/portfile.cmake | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index b2c1035da..28056958d 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -1,4 +1,5 @@ include(vcpkg_common_functions) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO log4cplus/log4cplus @@ -8,20 +9,20 @@ vcpkg_from_github( PATCHES fix-usage-error.patch ) -set(THREADPOOL_REF cc0b6371d3963f7028c2da5fc007733f9f3bf205) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/log4cplus/ThreadPool/archive/${THREADPOOL_REF}.tar.gz" - FILENAME "log4cplus-threadpool-${THREADPOOL_REF}.tar.gz" +vcpkg_from_github( + OUT_SOURCE_PATH THREADPOOL_SOURCE_PATH + REPO log4cplus/ThreadPool + REF cc0b6371d3963f7028c2da5fc007733f9f3bf205 SHA512 ad4d287c1f83acac4c127136bc92489c43bb5293613dc54b878b8e75a8583f7eefda6434d09789dad47b87a5d38f10a07a746d42d299410c11f2dbcce8af3012 + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) file( COPY - ${CURRENT_BUILDTREES_DIR}/src/ThreadPool-${THREADPOOL_REF}/COPYING - ${CURRENT_BUILDTREES_DIR}/src/ThreadPool-${THREADPOOL_REF}/example.cpp - ${CURRENT_BUILDTREES_DIR}/src/ThreadPool-${THREADPOOL_REF}/README.md - ${CURRENT_BUILDTREES_DIR}/src/ThreadPool-${THREADPOOL_REF}/ThreadPool.h + ${THREADPOOL_SOURCE_PATH}/COPYING + ${THREADPOOL_SOURCE_PATH}/example.cpp + ${THREADPOOL_SOURCE_PATH}/README.md + ${THREADPOOL_SOURCE_PATH}/ThreadPool.h DESTINATION ${SOURCE_PATH}/threadpool ) |