From cba75f1aa08374733dcc79abebeca262ae94118a Mon Sep 17 00:00:00 2001 From: Seunghyun Hwang Date: Fri, 16 Dec 2022 04:55:52 +0900 Subject: [PATCH] [asio] add target guard for target `asio::asio` (#28299) * add target guard * add port-version * add version --- ports/asio/asio-config.cmake | 7 +++++-- ports/asio/vcpkg.json | 1 + versions/a-/asio.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/asio/asio-config.cmake b/ports/asio/asio-config.cmake index 32e00095a7..1280722753 100644 --- a/ports/asio/asio-config.cmake +++ b/ports/asio/asio-config.cmake @@ -1,6 +1,9 @@ include ("${CMAKE_CURRENT_LIST_DIR}/asio-targets.cmake") -add_library(asio::asio INTERFACE IMPORTED) -target_link_libraries(asio::asio INTERFACE asio) + +if(NOT TARGET asio::asio) + add_library(asio::asio INTERFACE IMPORTED) + target_link_libraries(asio::asio INTERFACE asio) +endif() get_target_property(_ASIO_INCLUDE_DIR asio INTERFACE_INCLUDE_DIRECTORIES) set(ASIO_INCLUDE_DIR "${_ASIO_INCLUDE_DIR}") diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index b3608e5a06..38c777dda3 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "asio", "version": "1.24.0", + "port-version": 1, "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", "documentation": "https://think-async.com/Asio/asio-1.24.0/doc/", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index 3376212f66..4b1f8d3344 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b134a3e21a2ef661aa5e3802cefc22386c095aaa", + "version": "1.24.0", + "port-version": 1 + }, { "git-tree": "bba8740d419878e427c71f076d569f8a26833c6b", "version": "1.24.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9bcb585179..274d04fad3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -202,7 +202,7 @@ }, "asio": { "baseline": "1.24.0", - "port-version": 0 + "port-version": 1 }, "asio-grpc": { "baseline": "2.3.0",