aboutsummaryrefslogtreecommitdiff
path: root/ports/zookeeper
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-10-07 19:35:13 +0200
committerCurtis J Bezault <curtbezault@gmail.com>2019-10-07 10:35:13 -0700
commit726c11148105a97aef39bec024fdb7c140b1b154 (patch)
tree26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/zookeeper
parente86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff)
downloadvcpkg-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/zookeeper')
-rw-r--r--ports/zookeeper/portfile.cmake8
1 files changed, 3 insertions, 5 deletions
diff --git a/ports/zookeeper/portfile.cmake b/ports/zookeeper/portfile.cmake
index 2e315a61f..8fee1483c 100644
--- a/ports/zookeeper/portfile.cmake
+++ b/ports/zookeeper/portfile.cmake
@@ -10,21 +10,19 @@ vcpkg_download_distfile(ARCHIVE
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE ${ARCHIVE}
+ ARCHIVE ${ARCHIVE}
PATCHES
cmake.patch
win32.patch
)
-set(SOURCE_PATH ${SOURCE_PATH}/zookeeper-client/zookeeper-client-c)
-
set(WANT_SYNCAPI OFF)
if("sync" IN_LIST FEATURES)
set(WANT_SYNCAPI ON)
endif()
vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
+ SOURCE_PATH ${SOURCE_PATH}/zookeeper-client/zookeeper-client-c
DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
@@ -34,7 +32,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zookeeper RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/zookeeper-client/zookeeper-client-c/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zookeeper RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)