aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2019-06-28 13:50:32 -0700
committerGitHub <noreply@github.com>2019-06-28 13:50:32 -0700
commit62ed7c17318b4f46109c2de73b7584fb04e85720 (patch)
tree8651e22ce7bc0027ca8475e55c3b5527cb53390e
parent79175994c22effa9b3d945077837cdca5d370681 (diff)
downloadvcpkg-62ed7c17318b4f46109c2de73b7584fb04e85720.tar.gz
vcpkg-62ed7c17318b4f46109c2de73b7584fb04e85720.zip
[asio] fix flaky build (#7083)
-rw-r--r--ports/asio/CMakeLists.txt5
-rw-r--r--ports/asio/CONTROL2
-rw-r--r--ports/asio/portfile.cmake5
3 files changed, 6 insertions, 6 deletions
diff --git a/ports/asio/CMakeLists.txt b/ports/asio/CMakeLists.txt
index aa7354e76..4241b1ffc 100644
--- a/ports/asio/CMakeLists.txt
+++ b/ports/asio/CMakeLists.txt
@@ -3,11 +3,6 @@ project(asio)
add_library(asio INTERFACE)
-# Always use "ASIO_STANDALONE" to avoid boost dependency
-file(READ "asio/include/asio/detail/config.hpp" _contents)
-string(REPLACE "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)" _contents "${_contents}")
-file(WRITE "asio/include/asio/detail/config.hpp" "${_contents}")
-
# Export target
install(TARGETS asio
EXPORT asio
diff --git a/ports/asio/CONTROL b/ports/asio/CONTROL
index 49a2be94c..c0da68a9b 100644
--- a/ports/asio/CONTROL
+++ b/ports/asio/CONTROL
@@ -1,4 +1,4 @@
Source: asio
-Version: 1.12.2-1
+Version: 1.12.2-2
Homepage: https://github.com/chriskohlhoff/asio
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.
diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake
index f9b3b739d..6c6d438a1 100644
--- a/ports/asio/portfile.cmake
+++ b/ports/asio/portfile.cmake
@@ -9,6 +9,11 @@ vcpkg_from_github(
HEAD_REF master
)
+# Always use "ASIO_STANDALONE" to avoid boost dependency
+file(READ "${SOURCE_PATH}/asio/include/asio/detail/config.hpp" _contents)
+string(REPLACE "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)" _contents "${_contents}")
+file(WRITE "${SOURCE_PATH}/asio/include/asio/detail/config.hpp" "${_contents}")
+
# CMake install
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(