From 96b86613a83a7fbd386dd517fddfe53ce15176ef Mon Sep 17 00:00:00 2001 From: SeekingMeaning Date: Sat, 18 Jan 2020 06:48:23 -0800 Subject: [PATCH 1/3] [ppconsul] Possible fix for CI --- ports/ppconsul/portfile.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/ppconsul/portfile.cmake b/ports/ppconsul/portfile.cmake index 60da089e6cce63..fcff920b8b9dd4 100644 --- a/ports/ppconsul/portfile.cmake +++ b/ports/ppconsul/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oliora/ppconsul @@ -15,14 +13,13 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/ext/catch) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/ppconsul RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) From f41f87dc10748b9f2ae9e2201e500e275ffc7ba3 Mon Sep 17 00:00:00 2001 From: SeekingMeaning Date: Sat, 18 Jan 2020 06:58:40 -0800 Subject: [PATCH 2/3] Update CONTROL --- ports/ppconsul/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/ppconsul/CONTROL b/ports/ppconsul/CONTROL index 4902c1f0799d98..56cbdda3496fa4 100644 --- a/ports/ppconsul/CONTROL +++ b/ports/ppconsul/CONTROL @@ -2,4 +2,4 @@ Source: ppconsul Version: 0.4 Homepage: https://github.com/oliora/ppconsul Description: A C++ client library for Consul. Consul is a distributed tool for discovering and configuring services in your infrastructure. -Build-Depends: boost-core, boost-variant, curl[openssl], json11 +Build-Depends: boost-core, boost-variant, boost-optional, curl[openssl], json11 From e0dbff4c6db82cc1558ac6c1114064ebcf1770ea Mon Sep 17 00:00:00 2001 From: SeekingMeaning Date: Sat, 18 Jan 2020 07:10:18 -0800 Subject: [PATCH 3/3] Update --- ports/ppconsul/CONTROL | 4 ++-- ports/ppconsul/portfile.cmake | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/ppconsul/CONTROL b/ports/ppconsul/CONTROL index 56cbdda3496fa4..ea49156d975106 100644 --- a/ports/ppconsul/CONTROL +++ b/ports/ppconsul/CONTROL @@ -1,5 +1,5 @@ Source: ppconsul -Version: 0.4 +Version: 0.4-1 Homepage: https://github.com/oliora/ppconsul Description: A C++ client library for Consul. Consul is a distributed tool for discovering and configuring services in your infrastructure. -Build-Depends: boost-core, boost-variant, boost-optional, curl[openssl], json11 +Build-Depends: boost-core, boost-variant, boost-optional, boost-fusion, curl[openssl], json11 diff --git a/ports/ppconsul/portfile.cmake b/ports/ppconsul/portfile.cmake index fcff920b8b9dd4..50dd08c37521a6 100644 --- a/ports/ppconsul/portfile.cmake +++ b/ports/ppconsul/portfile.cmake @@ -13,6 +13,7 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/ext/catch) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA ) vcpkg_install_cmake()