aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-09-02 09:12:41 -0700
committerGitHub <noreply@github.com>2020-09-02 09:12:41 -0700
commitf4a2dce829fb7cbf7e988edc5eceb40e35cbf2a6 (patch)
tree87d327b2570bf45d3e79939d5fc011723eeef03f /ports
parentaa43b9c7ae94f904aaf46dfde66d5e2bd7af6107 (diff)
downloadvcpkg-f4a2dce829fb7cbf7e988edc5eceb40e35cbf2a6.tar.gz
vcpkg-f4a2dce829fb7cbf7e988edc5eceb40e35cbf2a6.zip
[vcpkg baseline][rest-rpc] Skip check in baseline (#13295)
Diffstat (limited to 'ports')
-rw-r--r--ports/msgpack/CONTROL3
-rw-r--r--ports/msgpack/portfile.cmake5
-rw-r--r--ports/rest-rpc/CONTROL1
-rw-r--r--ports/rest-rpc/portfile.cmake5
4 files changed, 11 insertions, 3 deletions
diff --git a/ports/msgpack/CONTROL b/ports/msgpack/CONTROL
index 1715eb780..1ea2e19c2 100644
--- a/ports/msgpack/CONTROL
+++ b/ports/msgpack/CONTROL
@@ -1,4 +1,5 @@
Source: msgpack
-Version: 3.2.0-1
+Version: 3.2.0
+Port-Version: 2
Homepage: https://github.com/msgpack/msgpack-c
Description: MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.
diff --git a/ports/msgpack/portfile.cmake b/ports/msgpack/portfile.cmake
index b0939176c..f6c6b4ed9 100644
--- a/ports/msgpack/portfile.cmake
+++ b/ports/msgpack/portfile.cmake
@@ -1,4 +1,7 @@
-include(vcpkg_common_functions)
+if (EXISTS ${CURRENT_INSTALLED_DIR}/include/msgpack/pack.h)
+ message(FATAL_ERROR "Cannot install ${PORT} when rest-rpc is already installed, please remove rest-rpc using \"./vcpkg remove rest-rpc:${TARGET_TRIPLET}\"")
+endif()
+
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO msgpack/msgpack-c
diff --git a/ports/rest-rpc/CONTROL b/ports/rest-rpc/CONTROL
index 92f622e93..ed7023bb4 100644
--- a/ports/rest-rpc/CONTROL
+++ b/ports/rest-rpc/CONTROL
@@ -1,5 +1,6 @@
Source: rest-rpc
Version: 0.07
+Port-Version: 1
Homepage: https://github.com/qicosmos/rest_rpc
Description: c++11, high performance, cross platform, easy to use rpc framework
Build-Depends: asio
diff --git a/ports/rest-rpc/portfile.cmake b/ports/rest-rpc/portfile.cmake
index 54872c175..551ff1428 100644
--- a/ports/rest-rpc/portfile.cmake
+++ b/ports/rest-rpc/portfile.cmake
@@ -1,5 +1,8 @@
-# header-only library
+if (EXISTS ${CURRENT_INSTALLED_DIR}/include/msgpack/pack.h)
+ message(FATAL_ERROR "Cannot install ${PORT} when msgpack is already installed, please remove msgpack using \"./vcpkg remove msgpack:${TARGET_TRIPLET}\"")
+endif()
+# header-only library
set(RESTRPC_VERSION V0.07)
set(RESTRPC_HASH 148152776c8c4f16e404c62ab3f46618e1817c0b4b186dbcc399c859efd110ed5a207bf56e961c312f80844f696f597068e0abc00e426409d50a2889d30c6d8e)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rest-rpc-${RESTRPC_VERSION})