diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-10-04 15:27:07 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-10-04 15:27:07 -0700 |
| commit | cd59ff4fcf56a9047144405986abc6e4e3417dde (patch) | |
| tree | a2a360a5d837914a8b1c98f2c45c9962837bd089 | |
| parent | 8c035ea36a64bb48e85d6c9a78cfb5bf050976e0 (diff) | |
| parent | 2a188efc695b04d8753821a622ec481b26343812 (diff) | |
| download | vcpkg-cd59ff4fcf56a9047144405986abc6e4e3417dde.tar.gz vcpkg-cd59ff4fcf56a9047144405986abc6e4e3417dde.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg
| -rw-r--r-- | ports/asio/CONTROL | 3 | ||||
| -rw-r--r-- | ports/asio/portfile.cmake | 16 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/ports/asio/CONTROL b/ports/asio/CONTROL new file mode 100644 index 000000000..466ef6cd0 --- /dev/null +++ b/ports/asio/CONTROL @@ -0,0 +1,3 @@ +Source: asio +Version: 1.10.6 +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 new file mode 100644 index 000000000..8c28b951b --- /dev/null +++ b/ports/asio/portfile.cmake @@ -0,0 +1,16 @@ +include(vcpkg_common_functions) +SET(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/asio-asio-1-10-6/asio/) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/chriskohlhoff/asio/archive/asio-1-10-6.zip" + FILENAME "asio-1-10-6.zip" + SHA512 7e3fde7e88d305d19b88482b73c8b7a41751d65e81bd23dd8ef45eb4e3ef3a10629696b4d347e5a68f08d6fb2dede15a2f38c7ee8d18ac88be769215542da4c6 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +# Handle copyright +file(COPY ${CURRENT_BUILDTREES_DIR}/src/asio-asio-1-10-6/asio/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/asio) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/asio/COPYING ${CURRENT_PACKAGES_DIR}/share/asio/copyright) + +# Copy the asio header files +file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp" PATTERN "*.ipp") +vcpkg_copy_pdbs() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index aa85c8ff4..3938d8d79 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -29,7 +29,7 @@ function(vcpkg_configure_cmake) -G ${GENERATOR} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TRIPLET_FILE} -DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR} -DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel @@ -44,7 +44,7 @@ function(vcpkg_configure_cmake) -G ${GENERATOR} -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TRIPLET_FILE} -DCMAKE_PREFIX_PATH=${CURRENT_INSTALLED_DIR}/debug\\\\\\\;${CURRENT_INSTALLED_DIR} -DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg |