3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-01 13:37:55 +08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Wimok Nupphiboon 2018-04-13 09:48:50 +07:00
commit 00cdc0b10a
161 changed files with 2339 additions and 1693 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
CHANGELOG.md
View File

@ -1,3 +1,68 @@
vcpkg (0.0.108)
--------------
* Add ports:
- google-cloud-cpp 0.1.0
- mhook 2.5.1-1
- mosquitto 1.4.15
- pmdk 1.4-1 (renamed from nvml)
* Remove Ports:
- nvml 1.3-0 (renamed to pmdk)
* Update ports:
- abseil 2018-03-23 -> 2018-04-05
- asio 1.12.0-1 -> 1.12.0-2
- aws-sdk-cpp 1.4.21 -> 1.4.30-1
- azure-c-shared-utility 1.0.0-pre-release-1.0.9 -> 1.1.2
- azure-iot-sdk-c 1.0.0-pre-release-1.0.9 -> 1.2.2
- azure-uamqp-c 1.0.0-pre-release-1.0.9 -> 1.2.2
- azure-umqtt-c 1.0.0-pre-release-1.0.9 -> 1.1.2
- breakpad 2018-03-13 -> 2018-04-05
- clara 2018-03-23 -> 2018-04-02
- cryptopp 5.6.5-1 -> 6.1.0-2
- discord-rpc 3.1.0 -> 3.2.0
- dlib 19.10 -> 19.10-1
- eastl 3.08.00 -> 3.09.00
- exiv2 2018-03-23 -> 2018-04-05
- folly 2017.11.27.00-3 -> 2018.03.19.00-2
- forest 4.5.0 -> 7.0.1
- gdcm2 2.8.5 -> 2.8.6
- grpc 1.10.0 -> 1.10.1
- gtest 1.8.0-7 -> 1.8.0-8
- libiconv 1.15-2 -> 1.15-3
- libuv 1.19.2 -> 1.20.0
- libvpx 1.6.1-2 -> 1.7.0
- libxml2 2.9.4-4 -> 2.9.4-5
- nuklear 2018-03-23 -> 2018-04-05
- openimageio 1.8.9 -> 1.8.10
- openssl 1.0.2n-3 -> 1.0.2o-1
- qt5-base 5.9.2-5 -> 5.9.2-6
- qt5-modularscripts 2 -> 3
- qwt 6.1.3-4 -> 6.1.3-5
- recast 1.5.1 -> 1.5.1-1
- rocksdb 5.11.3 -> 5.12.2
- rs-core-lib 2018-03-17 -> 2018-04-05
- sciter 4.1.4 -> 4.1.5
- tbb 2018_U2 -> 2018_U3
- tesseract 3.05.01-2 -> 3.05.01-3
- theia 0.7-d15154a-1 -> 0.7-d15154a-3
- thrift 2018-03-23 -> 2018-04-05
- unrar 5.5.8 -> 5.5.8-1
- yoga 1.7.0 -> 1.7.0-1
- zeromq 2018-03-23 -> 2018-04-05
* `vcpkg.cmake`: Remove detection for Windows SDK. Let `cmake` detect it instead.
* Rework `vcpkgTools.xml`.
- `<requiredVersion>` renamed to `<version>`
- `<archiveRelativePath>` renamed `<archiveName>`
- `<sha256>` changed to `<sha512>`
- `<tool>` tags now specify an `os="x"` property
- The version of the tools list (i.e. `<tools version="1">`) is now verified by `vcpkg.exe`.
* Use [7zip](https://www.7-zip.org/) to extract vcpkg tools defined in `vcpkgTools.xml`.
* Use [aria2](https://aria2.github.io/) to download vcpkg tools defined in `vcpkgTools.xml`.
- The experimental flag `vcpkg install <port> --x-use-aria2` allows you to use `aria2` for other downloads as well.
* `vckg hash` improvements
-- vcpkg team <vcpkg@microsoft.com> FRI, 06 Apr 2018 19:30:00 -0800
vcpkg (0.0.107)
--------------
* Add ports:

2
ports/abseil/CONTROL
View File

@ -1,5 +1,5 @@
Source: abseil
Version: 2018-04-02
Version: 2018-04-09
Description: an open-source collection designed to augment the C++ standard library.
Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.

4
ports/abseil/portfile.cmake
View File

@ -7,8 +7,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO abseil/abseil-cpp
REF 7b3c38a0628b9201ce92a6893b96890b64e5daa8
SHA512 6e23d98adabbefcf8054a0ff03fdbc5438efbd957cd4864ab870496468f9891eeb8f73796a37faba7412a4b88b96771fc23f3f0bb89ab6023800beb99e6660d3
REF 3f622d6c5990a7ae80eb8e52450c309a28bbec77
SHA512 27c11bbe4e321fcd42f1947fab2a7deb108443bf46260e7f7920cc28442a4dbfbf315d579e866b2d82e92cfe1fd43e82cbd51e907cbf74a25d724cfd8acda055
HEAD_REF master
)

3
ports/asio/CONTROL
View File

@ -1,4 +1,3 @@
Source: asio
Version: 1.12.0-1
Build-Depends: boost-config, boost-throw-exception, boost-utility, boost-date-time
Version: 1.12.0-2
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.

5
ports/asio/portfile.cmake
View File

@ -15,3 +15,8 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR
# Copy the asio header files
file(INSTALL ${SOURCE_PATH}/asio/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp" PATTERN "*.ipp")
# Always use "ASIO_STANDALONE" to avoid boost dependency
file(READ "${CURRENT_PACKAGES_DIR}/include/asio/detail/config.hpp" _contents)
string(REPLACE "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)" _contents "${_contents}")
file(WRITE "${CURRENT_PACKAGES_DIR}/include/asio/detail/config.hpp" "${_contents}")

6
ports/aws-sdk-cpp/CONTROL
View File

@ -1,6 +1,7 @@
Source: aws-sdk-cpp
Version: 1.4.27
Version: 1.4.32
Description: AWS SDK for C++
Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs
# Automatically generated by generateFeatures.ps1
@ -103,6 +104,9 @@ Description: C++ SDK for the AWS comprehend service
Feature: config
Description: C++ SDK for the AWS config service
Feature: connect
Description: C++ SDK for the AWS connect service
Feature: cur
Description: C++ SDK for the AWS cur service

3
ports/aws-sdk-cpp/CONTROL.in
View File

@ -1,4 +1,5 @@
Source: aws-sdk-cpp
Version: 1.4.21
Version: 1.4.30-1
Description: AWS SDK for C++
Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs

3
ports/aws-sdk-cpp/compute_build_only.cmake
View File

@ -98,6 +98,9 @@ endif()
if("config" IN_LIST FEATURES)
list(APPEND BUILD_ONLY config)
endif()
if("connect" IN_LIST FEATURES)
list(APPEND BUILD_ONLY connect)
endif()
if("cur" IN_LIST FEATURES)
list(APPEND BUILD_ONLY cur)
endif()

11
ports/aws-sdk-cpp/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO aws/aws-sdk-cpp
REF 1.4.27
SHA512 d714fe12d3701461b897256d824b169ff3242bb412d386a2c1455c0dc1dcedf3add444eab556551fbb69e0339b49c3133c1f820710b5681d25a23237e919ddd0
REF 1.4.32
SHA512 f37aaf1d439acd1563fe50624e2e7856ba5d267a540a8cd1fde80d0d7bd9e2cdd261f9f6e3e843548cc17b8ea7158419a9e0ed27092acf5c22b5c9e38d327c64
HEAD_REF master
)
@ -14,8 +14,11 @@ set(BUILD_ONLY core)
include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake)
# This handles escaping the list
string(REPLACE ";" "\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
if(CMAKE_HOST_WIN32)
string(REPLACE ";" "\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
else()
string(REPLACE ";" "\\\\\\\\\\\;" BUILD_ONLY "${BUILD_ONLY}")
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}

2
ports/azure-c-shared-utility/CONTROL
View File

@ -1,3 +1,3 @@
Source: azure-c-shared-utility
Version: 1.0.0-pre-release-1.0.9
Version: 1.1.2
Description: Azure C SDKs common code

4
ports/azure-c-shared-utility/portfile.cmake
View File

@ -8,8 +8,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-c-shared-utility
REF 1.0.0-pre-release-1.0.9
SHA512 df28d0bb01961943d86febd7b54bafd7037b8461b4025e1db26ba0b76c4cadfa722c4cb5695ac0d4f57e16576eb23f3da02703bcc363af54a0476bccec95ce45
REF 1.1.2
SHA512 23c576efe0cc6c4a47d356f1e0be9e23d2b4e22692d35efa7d0d627a05fad245c55a81d26e60e1f7f7676d547a0e28c357846d2854b31f3f6ae7c39a934cf3d4
HEAD_REF master
)

2
ports/azure-iot-sdk-c/CONTROL
View File

@ -1,4 +1,4 @@
Source: azure-iot-sdk-c
Version: 1.0.0-pre-release-1.0.9
Version: 1.2.2
Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson
Description: A C99 SDK for connecting devices to Microsoft Azure IoT services

4
ports/azure-iot-sdk-c/portfile.cmake
View File

@ -8,8 +8,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-iot-sdk-c
REF 1.0.0-pre-release-1.0.9
SHA512 972b5da73399805963031dfacc436665c1a7aaecf4a0035af369d9cf184cb4e7be608b4ca5768902dcfb04f18324c399d095f6543ff3d1da835c40da6e18934e
REF 1.2.2
SHA512 1542f8347e5efc3104eacf1696b84739299bedb4f50dce3869b3a53072b5c016aadf34223658c18fe28e87eab775a0687b5bf18b5629a7a87b8709b123b3599a
HEAD_REF master
)

2
ports/azure-uamqp-c/CONTROL
View File

@ -1,4 +1,4 @@
Source: azure-uamqp-c
Version: 1.0.0-pre-release-1.0.9
Version: 1.2.2
Build-Depends: azure-c-shared-utility
Description: AMQP library for C

4
ports/azure-uamqp-c/portfile.cmake
View File

@ -8,8 +8,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-uamqp-c
REF 1.0.0-pre-release-1.0.9
SHA512 8c7142e0f28779847501941effc8baa0d3411e76bec00a3af0a32f5e25c0ded200d1345fcea58d922d7b0e2b736bc2a57ecaaac23d4de7f97c75a22793cd3750
REF 1.2.2
SHA512 66d4169ecfa1f0bc37c1b61de34908703d1f2d49d5b6edf5aa0c208795117b614a3c0afbba95df3ffc5364f4fd45debe2c95ac7a5be86fbd42d997b4db2aaf9c
HEAD_REF master
)

2
ports/azure-umqtt-c/CONTROL
View File

@ -1,4 +1,4 @@
Source: azure-umqtt-c
Version: 1.0.0-pre-release-1.0.9
Version: 1.1.2
Build-Depends: azure-c-shared-utility
Description: General purpose library for communication over the mqtt protocol

4
ports/azure-umqtt-c/portfile.cmake
View File

@ -8,8 +8,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Azure/azure-umqtt-c
REF 1.0.0-pre-release-1.0.9
SHA512 8cabeb431e1b8db64551c0374e80157d9db39011f38db8d3a3dfb77ddf3d6ffed4d6ee0ab697a0af3ce93571fc8a83bb2f3efa52387afe301583151e75f55658
REF 1.1.2
SHA512 e99b1292d6acdefef43b13cb2ad5b5972ed9e65fb3b2b3eacf06486e88f65fdb1e119fd0cf7dadddb1b1dffaef1aa30edda68fa5dc8aa2b22bcdad2d56e1de63
HEAD_REF master
)

2
ports/breakpad/CONTROL
View File

@ -1,4 +1,4 @@
Source: breakpad
Version: 2018-03-27
Version: 2018-04-05
Build-Depends: libdisasm
Description: a set of client and server components which implement a crash-reporting system.

4
ports/breakpad/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/breakpad
REF e93f852a3c316ad767381d5e5bc839eba5c6225b
SHA512 8139472f4f9ce01770cf2922a52cc63fa009cfff93db893d297f61a1b44198b10bba73c92977e84c18a90ef7e71f0911e4fe9d27e8978fc38f231e499e23fc4d
REF adcc90ddb8c9ebc13a4312116ad92d8628b691c3
SHA512 f6dbdad54dcd778a2ece7de28b60b95c2c276d386f672ab5990c6de41f17fa526f6d1092e38163647ed2feed07c91826ec3f4c21a219ca5f5fac203a7a21eeec
HEAD_REF master
)

2
ports/catch2/CONTROL
View File

@ -1,4 +1,4 @@
Source: catch2
Version: 2.2.1-1
Version: 2.2.2
Description: A modern, header-only test framework for unit testing.
Issues, PRs and changelogs can be found at https://github.com/catchorg/Catch2

4
ports/catch2/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO catchorg/Catch2
REF v2.2.1
SHA512 48d3a0384dcd19fe622c4fda51639be36c904aaff77f5857615010c57e69d8e9f1deb2156e3e4882a592fe260d2bae0efa3cd02c2a2cabe07d9f9db09051a6b0
REF v2.2.2
SHA512 ab91036c6c3ace087d0382ce99f26b2c30a4b75d52f285619ca282a618470fe388afe47495f3b2764268d600c6834c60ba464483d06f3a1c4316c099477c8e38
HEAD_REF master
)

4
ports/directxmesh/CONTROL
View File

@ -1,3 +1,3 @@
Source: directxmesh
Version: feb2018
Source: directxmesh
Version: feb2018-eb751e0b631b05aa25c36c08e7d6bbf09f5e94a9
Description: DirectXMesh geometry processing library

4
ports/directxmesh/portfile.cmake
View File

@ -12,8 +12,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/DirectXMesh
REF feb2018
SHA512 b5d21c8960ef9c8f2e608807ce29fd4873d0f4ad5bb0b6432f6efbb6110bfd61a16fbaab8a5c626cc1977f48923a562a618f29b9b2f112db625c0a8eb43f0422
REF eb751e0b631b05aa25c36c08e7d6bbf09f5e94a9
SHA512 35a6be07fbdf5d9a39e7f5a3716057d09643d0c4bb43d39beae4233ca6941d2e2318b826dcc4a385dfa512675c7e28f320067b88bb325943b6532c8e65ebcd1b
HEAD_REF master
)

2
ports/exiv2/CONTROL
View File

@ -1,4 +1,4 @@
Source: exiv2
Version: 2018-04-02
Version: 2018-04-09
Build-Depends: zlib, expat, libiconv
Description: Image metadata library and tools http://www.exiv2.org

4
ports/exiv2/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Exiv2/exiv2
REF 07d75cd0e833286ce9e301ea83229f3e283c6191
SHA512 8cf5cb919c12e719d70f2ea71c84835f09f2962095eeb56bb27ef3cd22ad4ea032dfbf9704f9c7393de0a969d3ae0609dafeb619b6c28dca598c8f34a3810b4d
REF fbd8e2669e223d43c34777c61029bb19b4c6e833
SHA512 9c87e3123458e9dbf24df80118a09a6cc2c10855b19e59b3164634166b10f2daef54ac35a207bf8865eeb08cbc1d2d5b2ab33e4f2539bf8ffa82a7012c0eecc4
HEAD_REF master
)

2
ports/folly/CONTROL
View File

@ -1,5 +1,5 @@
Source: folly
Version: 2018.03.19.00-2
Version: 2018.04.09.00
Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread
Default-Features: zlib

6
ports/folly/portfile.cmake
View File

@ -17,8 +17,8 @@ set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF v2018.03.19.00
SHA512 72df8768753bf9f1109ad3f16645d811906b633833c91c7d9fe856a06c16b5e398876cf6cae415401eff96b568c99ffa1dc0c44d81cd40219bafb0f4c72fc2ca
REF v2018.04.09.00
SHA512 625034437ee6c261949652dbd6cafb50b0954b691750e4591cd0eb03cf369348cfae3b4b98c012bd906a157b7642ebcb1d8843311c74416ed51bffc5b1da3018
HEAD_REF master
)
@ -75,7 +75,7 @@ vcpkg_install_cmake(ADD_BIN_TO_PATH)
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/folly)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

4
ports/forest/CONTROL
View File

@ -1,3 +1,3 @@
Source: forest
Version: 4.5.0
Description: Forest is an open-source, template library of tree data structures written in C++11.
Version: 7.0.6
Description: Template library of tree data structures

15
ports/forest/portfile.cmake
View File

@ -1,13 +1,12 @@
# Ηeader-only library
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/forest-4.5.0)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/xorz57/forest/archive/4.5.0.zip"
FILENAME "forest-4.5.0.zip"
SHA512 ae256ad38802d0827cfcd45ffae35ddb95cf74e38cf3e5d806f6e2215f701abfb8159f82e2bb6362788fe96a9f9008429d366e7abbc7980b29b3528052cfe43e
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO xorz57/forest
REF 7.0.6
SHA512 a1e5d27f2b8b9e6758a67a9124fc25517074c633644651b26f6683bab09189569e75ccf4ae7d9cfeddae234435b073fc00e0f5385c4e9370062c3e8b222c1c59
HEAD_REF master
)
vcpkg_extract_source_archive(${ARCHIVE})
# Handle headers
file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.h")

2
ports/gdcm2/CONTROL
View File

@ -1,4 +1,4 @@
Source: gdcm2
Version: 2.8.5
Version: 2.8.6
Description: Grassroots DICOM library
Build-Depends: zlib, expat

4
ports/gdcm2/portfile.cmake
View File

@ -14,8 +14,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO malaterre/GDCM
REF v2.8.5
SHA512 644a7ad04746ffb36b7923796b967cc11fd3b71baede7722093d5785eaf869280c67a968f6b32aeb43cc7c88927fba78459e4846e058996a1634311311745510
REF v2.8.6
SHA512 c04c131afae6a326978d82ea7c6f42eaa5d8e0f9d9dc3b6ad531a2d6ef7261e603cef32f364609ae99ff33f144373fe7bdd62056e535b6d487b0a4b13919062e
)
vcpkg_apply_patches(

2
ports/graphicsmagick/CMakeLists.txt
View File

@ -77,7 +77,7 @@ add_library(graphicsmagick coders/art.c coders/avs.c
coders/tiff.c coders/tile.c coders/tim.c coders/topol.c
coders/ttf.c coders/txt.c coders/uil.c coders/url.c
coders/uyvy.c coders/vicar.c coders/vid.c coders/viff.c
coders/wbmp.c coders/webp.c coders/wmf.c coders/wpg.c
coders/wbmp.c coders/wmf.c coders/wpg.c
coders/x.c coders/xbm.c coders/xc.c coders/xcf.c
coders/xpm.c coders/xtrn.c coders/xwd.c coders/yuv.c
filters/analyze.c

2
ports/graphicsmagick/CONTROL
View File

@ -1,4 +1,4 @@
Source: graphicsmagick
Version: 1.3.26-2
Version: 1.3.28
Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff
Description: Image processing library

4
ports/graphicsmagick/portfile.cmake
View File

@ -1,12 +1,12 @@
include(vcpkg_common_functions)
set(GM_VERSION 1.3.26)
set(GM_VERSION 1.3.28)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/graphicsmagick-${GM_VERSION}-windows-source)
vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/${GM_VERSION}/GraphicsMagick-${GM_VERSION}-windows-source.7z"
FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z"
SHA512 c45a054d082d9a7a2889a2235dd5b96bd564acf55bd581426ecd32c426f9797d7d56d6e5f25a5a7da8ebd26bf0d962372b5d48d86532dc6c57522d27c0d18ec8
SHA512 0271c187634580204dcc3173553bae9e3cd799203d621ad9e2ba64be778760ac307f25af54859b10e60f8e2589287ad98062548f1c3c94f229e68e7c83878419
)
vcpkg_extract_source_archive(${ARCHIVE})

2
ports/grpc/CONTROL
View File

@ -1,4 +1,4 @@
Source: grpc
Version: 1.10.0
Version: 1.10.1
Build-Depends: zlib, openssl, protobuf, c-ares
Description: An RPC library and framework

4
ports/grpc/portfile.cmake
View File

@ -12,8 +12,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO grpc/grpc
REF v1.10.0
SHA512 52a3e2710fd51b92fb6345cddb9fd64a9b826bcb85dba86075b5e8465abf6dbc26a9245c9f79dd68b0c11a4fa3b983513091000991b61d77761b7debcdac3703
REF v1.10.1
SHA512 2221d902c60eada6dd1547a63d26bd3b30cb6710247b5e48523bacde498a3691cc177f1dbe9db8a007b8ae341a5b0c8ec999539e26a9bcff480a8d0b02140997
HEAD_REF master
)

2
ports/icu/CONTROL
View File

@ -1,3 +1,3 @@
Source: icu
Version: 59.1-1
Version: 61.1-1
Description: Mature and widely used Unicode and localization library.

35
ports/icu/portfile.cmake
View File

@ -1,15 +1,31 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
message(FATAL_ERROR "Error: UWP builds are currently not supported.")
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/icu-59.1/icu)
set(ICU_VERSION 59)
vcpkg_download_distfile(ARCHIVE
URLS "http://download.icu-project.org/files/icu4c/59.1/icu4c-59_1-src.zip"
FILENAME "icu4c-59_1-src.zip"
SHA512 1d3b39678e7cc4e9794e724982886a4918642231048eb76b9f683aad5a19e0b7c52b3b9c7107cb1a3879464682c4a3a97b58ab012d082bd9e5a80c67adf8ce8b)
vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/icu-59.1)
set(VERSION 61.1)
set(VERSION2 61_1)
set(ICU_VERSION_MAJOR 61)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/icu-${VERSION}/icu)
vcpkg_download_distfile(
ARCHIVE
URLS "http://download.icu-project.org/files/icu4c/${VERSION}/icu4c-${VERSION2}-src.zip"
FILENAME "icu4c-${VERSION2}-src.zip"
SHA512 60fed25976b8c2fe2df0b0ab745ded24da237711ec8c1e1dbdfe6eaf2014fb6b3a4bcaa488174cf770737a1c159a2d3f48a86a139cbb277163f064e607b8928f
)
vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/icu-${VERSION})
vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/disable-escapestr-tool.patch)
@ -109,8 +125,8 @@ file(REMOVE ${TEST_LIBS})
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
# copy icu dlls from lib to bin
file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/icu*${ICU_VERSION}.dll)
file(GLOB DEBUG_DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/icu*d${ICU_VERSION}.dll)
file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/icu*${ICU_VERSION_MAJOR}.dll)
file(GLOB DEBUG_DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/icu*d${ICU_VERSION_MAJOR}.dll)
file(COPY ${RELEASE_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
file(COPY ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
else()
@ -139,5 +155,6 @@ endif()
# This is expected because ICU database contains no executable code
vcpkg_copy_pdbs()
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/icu)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/icu/LICENSE ${CURRENT_PACKAGES_DIR}/share/icu/copyright)

2
ports/jsonnet/CONTROL
View File

@ -1,3 +1,3 @@
Source: jsonnet
Version: 2018-03-17
Version: 2018-04-09
Description: Jsonnet - The data templating language

4
ports/jsonnet/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/jsonnet
REF 9829acf280a64b58ad0b14c9f5c28fe8564ed13e
SHA512 5ddcc3d6bc91467da766ba0ed81251066e348db14d1fdf681bdd6c08189249d1c221dab73cc6bdf85465217aeda186f2f5c0eee11bb179435a52ff57be12d20e
REF bdbb3b32dda55b42b1f8843acc88f7bb4e38103f
SHA512 a275b63169a24c3319029dee85ec1efec54310cbc8a347a3f791dae6c2565358b74ce48f373453abd7b57361b67388fb85b9401f014df0b132f1cf0dd9babb49
HEAD_REF master
)

2
ports/libiconv/CONTROL
View File

@ -1,3 +1,3 @@
Source: libiconv
Version: 1.15-2
Version: 1.15-3
Description: GNU Unicode text conversion

2
ports/libiconv/portfile.cmake
View File

@ -1,7 +1,7 @@
if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/libiconv)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-iconv-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-iconv-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-iconv)
return()
endif()

2
ports/libiconv/unofficial-iconv-config.cmake Normal file
View File

@ -0,0 +1,2 @@
add_library(unofficial::iconv::libcharset UNKNOWN IMPORTED)
add_library(unofficial::iconv::libiconv UNKNOWN IMPORTED)

2
ports/libiconv/vcpkg-iconv-config.cmake
View File

@ -1,2 +0,0 @@
add_library(unofficial::vcpkg::libcharset UNKNOWN IMPORTED)
add_library(unofficial::vcpkg::libiconv UNKNOWN IMPORTED)

47
ports/liblinear/CMakeLists.txt Normal file
View File

@ -0,0 +1,47 @@
cmake_minimum_required(VERSION 3.9)
project(liblinear)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
add_library(blas OBJECT
blas/daxpy.c
blas/ddot.c
blas/dnrm2.c
blas/dscal.c
)
add_library(liblinear
linear.cpp
tron.cpp
$<TARGET_OBJECTS:blas>
)
target_include_directories(liblinear PRIVATE .)
if(BUILD_SHARED_LIBS)
target_link_libraries(liblinear PRIVATE "-DEF:${CMAKE_CURRENT_SOURCE_DIR}/linear.def")
endif()
add_executable(train train.c $<TARGET_OBJECTS:blas>)
target_link_libraries(train liblinear)
add_executable(predict predict.c $<TARGET_OBJECTS:blas>)
target_link_libraries(predict liblinear)
install(
TARGETS liblinear
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
if(NOT DISABLE_INSTALL_TOOLS)
install(
TARGETS train predict
RUNTIME DESTINATION tools/liblinear
)
endif()
if(NOT DISABLE_INSTALL_HEADERS)
install(
FILES linear.h tron.h
DESTINATION include/liblinear)
endif()

3
ports/liblinear/CONTROL Normal file
View File

@ -0,0 +1,3 @@
Source: liblinear
Version: 2.20
Description: A Library for Large Linear Classification

26
ports/liblinear/portfile.cmake Normal file
View File

@ -0,0 +1,26 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cjlin1/liblinear
REF v220
SHA512 cde798b7cb221513cf2b8bbe134d6c3dce1ed26c43504d8c09dbed93b82ca47bfd271d4dd3d03384187273906ce140d4ce4418a4a8c21410015ec1631c1042c6
HEAD_REF master
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG
-DDISABLE_INSTALL_HEADERS=ON
-DDISABLE_INSTALL_TOOLS=ON
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblinear)
file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblinear RENAME copyright)
file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblinear)

84
ports/libxml2/CMakeLists.txt
View File

@ -3,60 +3,16 @@ project(libxml2 C)
option(INSTALL_HEADERS "Install public header files" ON)
set(CMAKE_SHARED_LIBRARY_PREFIX)
set(CMAKE_STATIC_LIBRARY_PREFIX)
find_package(ZLIB REQUIRED)
find_package(LibLZMA REQUIRED)
if(WIN32)
find_library(ICONV NAMES libiconv)
find_library(ICONV_CHARSET NAMES libcharset)
endif()
find_package(unofficial-iconv REQUIRED)
set(SOURCES
buf.c
c14n.c
catalog.c
chvalid.c
debugXML.c
dict.c
DOCBparser.c
encoding.c
entities.c
error.c
globals.c
hash.c
HTMLparser.c
HTMLtree.c
legacy.c
list.c
nanoftp.c
nanohttp.c
parser.c
parserInternals.c
pattern.c
relaxng.c
SAX.c
SAX2.c
schematron.c
threads.c
tree.c
uri.c
valid.c
xinclude.c
xlink.c
xmlIO.c
xmlmemory.c
xmlreader.c
xmlregexp.c
xmlmodule.c
xmlsave.c
xmlschemas.c
xmlschemastypes.c
xmlstring.c
xmlunicode.c
xmlwriter.c
xpath.c
xpointer.c
xzlib.c
)
file(GLOB SOURCES *.c)
list(FILTER SOURCES EXCLUDE REGEX "/(run|test|trio)[^/]*$")
list(FILTER SOURCES EXCLUDE REGEX "xml(lint|catalog).c$")
# Generate xmlexports with fixed definition of LIBXML_STATIC
file(READ include/libxml/xmlexports.h XMLEXPORTS_H)
@ -67,25 +23,33 @@ else()
endif()
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/xmlexports.h "${XMLEXPORTS_H}")
file(GLOB PUBLIC_HEADERS include/libxml/*.h)
list(FILTER PUBLIC_HEADERS EXCLUDE REGEX "xmlexports\\.h$")
list(APPEND PUBLIC_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/xmlexports.h)
configure_file(include/win32config.h config.h COPYONLY)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
configure_file(include/win32config.h config.h COPYONLY)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
configure_file("${PORT_DIR}/config.osx.h" config.h COPYONLY)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
configure_file("${PORT_DIR}/config.linux.h" config.h COPYONLY)
else()
message(FATAL_ERROR "No config.h checked in for the target platform. Please run ./configure for libxml2 and add the resulting config.h into this port.")
endif()
add_library(libxml2 ${SOURCES})
if(INSTALL_HEADERS)
file(GLOB PUBLIC_HEADERS include/libxml/*.h)
list(FILTER PUBLIC_HEADERS EXCLUDE REGEX "xmlexports\\.h$")
list(APPEND PUBLIC_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/xmlexports.h)
set_target_properties(libxml2 PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
endif()
target_include_directories(libxml2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR} win32/vc10 include ${LIBLZMA_INCLUDE_DIRS})
target_include_directories(libxml2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR} include ${LIBLZMA_INCLUDE_DIRS})
target_link_libraries(libxml2 PRIVATE
unofficial::iconv::libcharset unofficial::iconv::libiconv
ZLIB::ZLIB
${LIBLZMA_LIBRARIES}
)
if(WIN32)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
target_include_directories(libxml2 PRIVATE win32/vc10)
target_link_libraries(libxml2 PRIVATE
${ICONV}
${ICONV_CHARSET}
wsock32.lib
ws2_32.lib
)

2
ports/libxml2/CONTROL
View File

@ -1,4 +1,4 @@
Source: libxml2
Version: 2.9.4-4
Version: 2.9.4-5
Description: Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform)
Build-Depends: zlib, libiconv, liblzma

56
ports/libxml2/config.linux.h Normal file
View File

@ -0,0 +1,56 @@
#define GETHOSTBYNAME_ARG_CAST /**/
#define HAVE_ANSIDECL_H 1
#define HAVE_ARPA_INET_H 1
#define HAVE_ARPA_NAMESER_H 1
#define HAVE_CTYPE_H 1
#define HAVE_DIRENT_H 1
#define HAVE_DLFCN_H 1
#define HAVE_DLOPEN /**/
#define HAVE_ERRNO_H 1
#define HAVE_FCNTL_H 1
#define HAVE_FLOAT_H 1
#define HAVE_FTIME 1
#define HAVE_GETADDRINFO /**/
#define HAVE_GETTIMEOFDAY 1
#define HAVE_INTTYPES_H 1
#define HAVE_ISASCII 1
#define HAVE_LIMITS_H 1
#define HAVE_LOCALTIME 1
#define HAVE_LZMA_H 1
#define HAVE_MALLOC_H 1
#define HAVE_MATH_H 1
#define HAVE_MMAP 1
#define HAVE_NETDB_H 1
#define HAVE_NETINET_IN_H 1
#define HAVE_POLL_H 1
#define HAVE_PTHREAD_H /**/
#define HAVE_PUTENV 1
#define HAVE_RAND 1
#define HAVE_RAND_R 1
#define HAVE_RESOLV_H 1
#define HAVE_SIGNAL_H 1
#define HAVE_SRAND 1
#define HAVE_STAT 1
#define HAVE_STDARG_H 1
#define HAVE_STDINT_H 1
#define HAVE_STDLIB_H 1
#define HAVE_STRFTIME 1
#define HAVE_STRINGS_H 1
#define HAVE_STRING_H 1
#define HAVE_SYS_MMAN_H 1
#define HAVE_SYS_SELECT_H 1
#define HAVE_SYS_SOCKET_H 1
#define HAVE_SYS_STAT_H 1
#define HAVE_SYS_TIMEB_H 1
#define HAVE_SYS_TIME_H 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_TIME 1
#define HAVE_TIME_H 1
#define HAVE_UNISTD_H 1
#define HAVE_VA_COPY 1
#define HAVE_ZLIB_H 1
#define ICONV_CONST
#define SEND_ARG2_CAST /**/
#define SUPPORT_IP6 /**/
#define VA_LIST_IS_ARRAY 1
#define XML_SOCKLEN_T socklen_t

54
ports/libxml2/config.osx.h Normal file
View File

@ -0,0 +1,54 @@
#define GETHOSTBYNAME_ARG_CAST /**/
#define HAVE_ARPA_INET_H 1
#define HAVE_ARPA_NAMESER_H 1
#define HAVE_CTYPE_H 1
#define HAVE_DIRENT_H 1
#define HAVE_DLFCN_H 1
#define HAVE_DLOPEN /**/
#define HAVE_ERRNO_H 1
#define HAVE_FCNTL_H 1
#define HAVE_FLOAT_H 1
#define HAVE_FTIME 1
#define HAVE_GETADDRINFO /**/
#define HAVE_GETTIMEOFDAY 1
#define HAVE_INTTYPES_H 1
#define HAVE_ISASCII 1
#define HAVE_LIMITS_H 1
#define HAVE_LOCALTIME 1
#define HAVE_LZMA_H 1
#define HAVE_MATH_H 1
#define HAVE_MMAP 1
#define HAVE_NETDB_H 1
#define HAVE_NETINET_IN_H 1
#define HAVE_POLL_H 1
#define HAVE_PTHREAD_H /**/
#define HAVE_PUTENV 1
#define HAVE_RAND 1
#define HAVE_RAND_R 1
#define HAVE_RESOLV_H 1
#define HAVE_SIGNAL_H 1
#define HAVE_SRAND 1
#define HAVE_STAT 1
#define HAVE_STDARG_H 1
#define HAVE_STDINT_H 1
#define HAVE_STDLIB_H 1
#define HAVE_STRFTIME 1
#define HAVE_STRINGS_H 1
#define HAVE_STRING_H 1
#define HAVE_SYS_MMAN_H 1
#define HAVE_SYS_SELECT_H 1
#define HAVE_SYS_SOCKET_H 1
#define HAVE_SYS_STAT_H 1
#define HAVE_SYS_TIMEB_H 1
#define HAVE_SYS_TIME_H 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_TIME 1
#define HAVE_TIME_H 1
#define HAVE_UNISTD_H 1
#define HAVE_VA_COPY 1
#define HAVE_ZLIB_H 1
#define ICONV_CONST
#define SEND_ARG2_CAST /**/
#define SUPPORT_IP6 /**/
#define VA_LIST_IS_ARRAY 1
#define XML_SOCKLEN_T socklen_t

1
ports/libxml2/portfile.cmake
View File

@ -12,6 +12,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DPORT_DIR=${CMAKE_CURRENT_LIST_DIR}
OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
)

18
ports/libxml2/vcpkg-cmake-wrapper.cmake
View File

@ -1,11 +1,13 @@
_find_package(${ARGS})
if(LibXml2_FOUND AND (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
if(LibXml2_FOUND)
find_package(LibLZMA)
list(APPEND LIBXML2_LIBRARIES
${LIBLZMA_LIBRARIES}
debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libiconv.lib
optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libiconv.lib
debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libcharset.lib
optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libcharset.lib
ws2_32)
list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES})
if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
list(APPEND LIBXML2_LIBRARIES
debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libiconv.lib
optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libiconv.lib
debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libcharset.lib
optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libcharset.lib
ws2_32)
endif()
endif()

2
ports/nuklear/CONTROL
View File

@ -1,3 +1,3 @@
Source: nuklear
Version: 2018-04-02
Version: 2018-04-06
Description: This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain

4
ports/nuklear/portfile.cmake
View File

@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO vurtun/nuklear
REF 60bd95c926f73b143ec91e66b2fe315ad2a316e1
SHA512 45cf7c5cab105241aec6c2a56a34abf9701eded52bf06d3092e0079949757a6cbb0d684b45952a054451384cd07a77b1763526470ec84835da3d514c614c65ba
REF bca152011e3f5839c7eb08864f76f1f900d4ffe7
SHA512 aa3bf7f9f32fe63140505e4845a9ee22fb9feb1abc3dd36b333697548778272b817795844a8b6f5cc95a4e460afd69fd96359955ab4e8d12737ac4b46be7e4d1
HEAD_REF master
)
file(INSTALL ${SOURCE_PATH}/nuklear.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)

14
ports/openal-soft/cmake-3-11.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a871f4c..f9f6b34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -965,7 +965,8 @@ OPTION(ALSOFT_REQUIRE_DSOUND "Require DirectSound backend" OFF)
OPTION(ALSOFT_REQUIRE_MMDEVAPI "Require MMDevApi backend" OFF)
IF(HAVE_WINDOWS_H)
# Check MMSystem backend
- CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502)
+ set(CMAKE_REQUIRED_DEFINITIONS -D_WIN32_WINNT=0x0502)
+ CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H)
IF(HAVE_MMSYSTEM_H)
CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM)
IF(HAVE_LIBWINMM)

8
ports/openal-soft/portfile.cmake
View File

@ -11,8 +11,12 @@ vcpkg_from_github(
HEAD_REF master
)
vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/dont-export-symbols-in-static-build.patch)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/dont-export-symbols-in-static-build.patch
${CMAKE_CURRENT_LIST_DIR}/cmake-3-11.patch
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(OPENAL_LIBTYPE "SHARED")

2
ports/openvr/CONTROL
View File

@ -1,3 +1,3 @@
Source: openvr
Version: 1.0.13
Version: 1.0.14
Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.

4
ports/openvr/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ValveSoftware/openvr
REF v1.0.13
SHA512 3ec901f9363f9517fd3246cf58c0792c2446c39d61997a46375756b0965e6fad6902a5d1b87eb65c579e1b615cbb6e6688e7dc8ced957e5dc50b4c4dcbbb36b9
REF v1.0.14
SHA512 2f38622121911ad4d59971fe88313f839fcb3bddae07af266b3b9f804a8c3855b4eb67d9153f0979db3465279dfcce9cb0bfe83451bf8639be5cdc9acafa2eda
HEAD_REF master
)

8
ports/plplot/portfile.cmake
View File

@ -53,6 +53,14 @@ file(REMOVE
${CURRENT_PACKAGES_DIR}/bin/pltek.exe
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
message(STATUS "Static build: Removing the full bin directory.")
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/bin
${CURRENT_PACKAGES_DIR}/bin
)
endif()
# Remove unwanted and duplicate directories
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include

2
ports/protobuf/CONTROL
View File

@ -1,5 +1,5 @@
Source: protobuf
Version: 3.5.1-1
Version: 3.5.1-2
Description: Protocol Buffers - Google's data interchange format
Feature: zlib

30
ports/protobuf/portfile.cmake
View File

@ -21,7 +21,7 @@ vcpkg_apply_patches(
"${CMAKE_CURRENT_LIST_DIR}/js-embed.patch"
)
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(CMAKE_HOST_WIN32)
set(TOOL_PATH ${CURRENT_BUILDTREES_DIR}/src/protobuf-${PROTOBUF_VERSION}-win32)
vcpkg_download_distfile(TOOL_ARCHIVE_FILE
URLS "https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-win32.zip"
@ -85,27 +85,39 @@ endfunction()
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/include)
if(CMAKE_HOST_WIN32)
set(EXECUTABLE_SUFFIX ".exe")
else()
set(EXECUTABLE_SUFFIX "")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(READ ${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake RELEASE_MODULE)
string(REPLACE "\${_IMPORT_PREFIX}/bin/protoc.exe" "\${_IMPORT_PREFIX}/tools/protoc.exe" RELEASE_MODULE "${RELEASE_MODULE}")
string(REPLACE "\${_IMPORT_PREFIX}/bin/protoc${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/protoc${EXECUTABLE_SUFFIX}" RELEASE_MODULE "${RELEASE_MODULE}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-release.cmake "${RELEASE_MODULE}")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(READ ${CURRENT_PACKAGES_DIR}/debug/share/protobuf/protobuf-targets-debug.cmake DEBUG_MODULE)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" DEBUG_MODULE "${DEBUG_MODULE}")
string(REPLACE "\${_IMPORT_PREFIX}/debug/bin/protoc.exe" "\${_IMPORT_PREFIX}/tools/protoc.exe" DEBUG_MODULE "${DEBUG_MODULE}")
string(REPLACE "\${_IMPORT_PREFIX}/debug/bin/protoc${EXECUTABLE_SUFFIX}" "\${_IMPORT_PREFIX}/tools/protoc${EXECUTABLE_SUFFIX}" DEBUG_MODULE "${DEBUG_MODULE}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/protobuf/protobuf-targets-debug.cmake "${DEBUG_MODULE}")
endif()
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
if(CMAKE_HOST_WIN32)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
else()
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin/protoc.exe)
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin/protoc.exe)
endif()
else()
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin/protoc.exe)
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin/protoc.exe)
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/bin)
file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/protoc DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/bin)
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@ -115,7 +127,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/protobuf RENAME copyright)
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(CMAKE_HOST_WIN32)
file(INSTALL ${TOOL_PATH}/bin/protoc.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
endif()
vcpkg_copy_pdbs()

2
ports/pugixml/CONTROL
View File

@ -1,3 +1,3 @@
Source: pugixml
Version: 1.8.1-3
Version: 1.9-1
Description: C++ XML processing library

47
ports/pugixml/portfile.cmake
View File

@ -1,32 +1,33 @@
# Common Ambient Variables:
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
# PORT = current port name (zlib, etc)
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
#
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pugixml-1.8)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/zeux/pugixml/releases/download/v1.8.1/pugixml-1.8.1.zip"
FILENAME "pugixml-1.8.1.zip"
SHA512 683fe224a9bcac032d78cb44d03915a3766d2faa588f3a8486b5719f26eeba3e17d447edf70e1907f51f8649ffb4607b6badd1365e4c15cf24279bf577dc853e
)
vcpkg_extract_source_archive(${ARCHIVE})
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
)
else()
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/pugixmlapi.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DBUILD_DEFINES="PUGIXML_API=__declspec\(dllexport\)"
)
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zeux/pugixml
REF v1.9
SHA512 f97941941d98a1a056087edc0dde6376bf2cc12ce4523b67a2f2ec5ae0895c2a2e55da32fcca6a997f1a0d918c5f39564167da0a07ce0d7da92880ad8631c31e
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/pugixml")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/readme.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/pugixml RENAME copyright)

13
ports/pugixml/pugixmlapi.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index 4d76bfa..75a4f8a 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -50,7 +50,7 @@
// If no API is defined, assume default
#ifndef PUGIXML_API
-# define PUGIXML_API
+# define PUGIXML_API __declspec(dllimport)
#endif
// If no API for classes is defined, assume default

2
ports/rocksdb/CONTROL
View File

@ -1,5 +1,5 @@
Source: rocksdb
Version: 5.11.3-3
Version: 5.12.2
Description: A library that provides an embeddable, persistent key-value store for fast storage
Default-Features: zlib

20
ports/rocksdb/pass-major-version.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6bfbf2..ea6a884 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,6 +132,7 @@ endif()
string(REGEX REPLACE "[^0-9a-f]+" "" GIT_SHA "${GIT_SHA}")
+if(NOT DEFINED ROCKSDB_VERSION OR NOT DEFINED ROCKSDB_VERSION_MAJOR)
set(SH_CMD "sh")
execute_process(COMMAND
${SH_CMD} -c "build_tools/version.sh full"
@@ -145,6 +146,7 @@ execute_process(COMMAND
OUTPUT_VARIABLE ROCKSDB_VERSION_MAJOR
)
string(STRIP "${ROCKSDB_VERSION_MAJOR}" ROCKSDB_VERSION_MAJOR)
+endif()
option(WITH_MD_LIBRARY "build with MD" ON)
if(WIN32 AND MSVC)

10
ports/rocksdb/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/rocksdb
REF rocksdb-5.11.3
SHA512 a4c771e36056ee0da497202b25092d89799db43573a442568b4392b8478ac20320dabf4c904e93bd0641a32f249e9c8dcad0d67577acaee6902cd4d30f29ce57
REF v5.12.2
SHA512 53e81e87e84f0500cd09d754c39e86265a16a52d4b84f9044f8d9759c224881eb7ef4bf89f9b01fdff25f123ed4dfa7b5cb272d2311f27b322c15fe2e893bbe3
HEAD_REF master
)
@ -14,6 +14,7 @@ vcpkg_apply_patches(
"${CMAKE_CURRENT_LIST_DIR}/0002-disable-gtest.patch"
"${CMAKE_CURRENT_LIST_DIR}/0003-only-build-one-flavor.patch"
"${CMAKE_CURRENT_LIST_DIR}/use-find-package.patch"
"${CMAKE_CURRENT_LIST_DIR}/pass-major-version.patch"
)
file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzlib.cmake")
@ -48,7 +49,8 @@ if("zlib" IN_LIST FEATURES)
endif()
get_filename_component(ROCKSDB_VERSION "${SOURCE_PATH}" NAME)
string(REPLACE "rocksdb-rocksdb-" "" ROCKSDB_VERSION "${ROCKSDB_VERSION}")
string(REPLACE "rocksdb-" "" ROCKSDB_VERSION "${ROCKSDB_VERSION}")
string(REGEX REPLACE "^([0-9]+)." "\\1" ROCKSDB_MAJOR_VERSION "${ROCKSDB_VERSION}")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
@ -67,7 +69,7 @@ vcpkg_configure_cmake(
-DROCKSDB_DISABLE_INSTALL_SHARED_LIB=${ROCKSDB_DISABLE_INSTALL_SHARED_LIB}
-DROCKSDB_DISABLE_INSTALL_STATIC_LIB=${ROCKSDB_DISABLE_INSTALL_STATIC_LIB}
-DROCKSDB_VERSION=${ROCKSDB_VERSION}
-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}
-DROCKSDB_VERSION_MAJOR=${ROCKSDB_MAJOR_VERSION}
-DCMAKE_DISABLE_FIND_PACKAGE_TBB=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE

2
ports/rs-core-lib/CONTROL
View File

@ -1,4 +1,4 @@
Source: rs-core-lib
Version: 2018-03-29
Version: 2018-04-09
Description: Minimal common utilities by Ross Smith

4
ports/rs-core-lib/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CaptainCrowbar/rs-core-lib
REF 3300d39fef567adf90f59d07223e55ca44ed4f98
SHA512 0e696a94ab71ca29c61075d917a26b01057f657537c5516cb3bf2fd046d5c61f7e74d83a7c2eba2d4d923f3bd8b125f61c6732d09ade59b0995f42eb3df22a17
REF ca8065dea45355836d9ca834823775c23a1f3571
SHA512 4bead4c2317f8b1f33844eacd052724680da6e00d52acb9238a458598a0745a86e91ac8f41a9b2ec4be1365a18e727e1e2659910f293d3bfe3f3b49d34d20b30
HEAD_REF master
)

2
ports/shogun/CONTROL
View File

@ -1,4 +1,4 @@
Source: shogun
Version: 6.1.3
Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas, nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent
Build-Depends: bzip2, eigen3, liblzma, libxml2, openblas (x64), nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent
Description: Unified and efficient Machine Learning

11
ports/shogun/portfile.cmake
View File

@ -22,6 +22,16 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/external)
file(MAKE_DIRECTORY ${SOURCE_PATH}/cmake/external)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/MSDirent.cmake DESTINATION ${SOURCE_PATH}/cmake/external)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(CMAKE_DISABLE_FIND_PACKAGE_BLAS 0)
else()
set(CMAKE_DISABLE_FIND_PACKAGE_BLAS 1)
endif()
vcpkg_find_acquire_program(PYTHON3)
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
set(ENV{PATH} "$ENV{PATH};${PYTHON3_DIR}")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@ -47,6 +57,7 @@ vcpkg_configure_cmake(
-DCMAKE_DISABLE_FIND_PACKAGE_Ctags=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_CCache=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=TRUE
-DCMAKE_DISABLE_FIND_PACKAGE_BLAS=${CMAKE_DISABLE_FIND_PACKAGE_BLAS}
-DINSTALL_TARGETS=shogun-static
)

2
ports/sol/CONTROL
View File

@ -1,3 +1,3 @@
Source: sol
Version: 2.18.7
Version: 2.19.5
Description: Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great

4
ports/sol/portfile.cmake
View File

@ -14,8 +14,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ThePhD/sol2
REF v2.18.7
SHA512 747dbcba2da4e44bfb365c0fd0c8df916d0e5d0ddbaa9df514838d84a8fd4261c87db7d14d9683b708b874cd6a73586e7854d9a784743a737858b73acdd78f1c
REF v2.19.5
SHA512 c004c2331e2eb0aae4467c10609f73879246c3ab5b7421e5b6fcb91b0c6595d999e5fd4c70b1859af1febb374631640d6727bf236a0cd176e40f631813e243a9
HEAD_REF develop
)

2
ports/sqlite3/CONTROL
View File

@ -1,5 +1,5 @@
Source: sqlite3
Version: 3.21.0-1
Version: 3.23.0
Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.
Feature: tool

6
ports/sqlite3/portfile.cmake
View File

@ -1,11 +1,11 @@
include(vcpkg_common_functions)
set(SQLITE_VERSION 3210000)
set(SQLITE_HASH 0a272b00825d07528c3842ccd483d81e5e719ab56737eec0972f7f8191dfbe92e35777ab8d1b37c95fde9320bbfa3c365a4b30253af876340f55517ea96bf665)
set(SQLITE_VERSION 3230000)
set(SQLITE_HASH bfca2ec16d926c11c9ec052eae41549f1de392582227ca08eb8a01cc36e58ac528c7677fdab253250ba3e0cf6e5cd9d3d0012e5b558be7db91740ac901dae0fe)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/sqlite-amalgamation-${SQLITE_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "https://sqlite.org/2017/sqlite-amalgamation-${SQLITE_VERSION}.zip"
URLS "https://sqlite.org/2018/sqlite-amalgamation-${SQLITE_VERSION}.zip"
FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip"
SHA512 ${SQLITE_HASH})
vcpkg_extract_source_archive(${ARCHIVE})

4
ports/tbb/portfile.cmake
View File

@ -10,8 +10,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO 01org/tbb
REF 2018_U3
SHA512 e92a2aabcdd456c1676eb9ce20653908a867ea18ff118f5f039823f5a10a0da3de61d0044774ad38b137e636fa8602af009dfeb59c84005fe90c6206aa3306ab
REF 633b01ad27e012e1dc4e392c3230250d1f4967a4
SHA512 5576b5e1efa0c7938dc08a1a9503ea19234b20f6a742f3d13a8de19b47f5bdafa1bb855e4de022a4b096a429e66739599a198fdf687c167c659f7556235fa01f
HEAD_REF tbb_2018)
if(TRIPLET_SYSTEM_ARCH STREQUAL x86)

4
ports/theia/CONTROL
View File

@ -1,4 +1,4 @@
Source: theia
Version: 0.7-d15154a-2
Build-Depends: flann, cereal, ceres[suitesparse], openimageio, glew, freeglut
Version: 0.7-d15154a-3
Build-Depends: flann, cereal, ceres[suitesparse] (!x86&!uwp&!arm&!linux&!osx), openimageio, glew, freeglut
Description: An open source library for multiview geometry and structure from motion

4
ports/theia/portfile.cmake
View File

@ -3,6 +3,10 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(VCPKG_LIBRARY_LINKAGE static)
endif()
if(VCPKG_TARGET_ARCHIECTURE STREQUAL "x86")
message(FATAL_ERROR "theia requires ceres[suitesparse] which depends on suitesparse which depends on openblas which is unavailable on x86.")
endif()
include(vcpkg_common_functions)
vcpkg_from_github(

2
ports/thrift/CONTROL
View File

@ -1,4 +1,4 @@
Source: thrift
Version: 2018-04-02
Version: 2018-04-09
Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit
Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. Originally developed at Facebook, Thrift was open sourced in April 2007 and entered the Apache Incubator in May, 2008. Thrift became an Apache TLP in October, 2010.

4
ports/thrift/portfile.cmake
View File

@ -15,8 +15,8 @@ vcpkg_find_acquire_program(BISON)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apache/thrift
REF 3c0edfa875218bd83f6b79a7823380e2adc08ae6
SHA512 8499ae6adf0db725f847f25f1c0b0ccf0abd8b142dd410a8a3c544dfd2fae8bdf1dec86e74eee3b4f78288f53ed5a162214d963513456d9b3be794e157c00a38
REF 606f1ef31447526b908244933d5b716397a6bad8
SHA512 101de834e8f19ed5f4855a3b138425ffdc8103565f04656f1544098821ad54d5e89f8275cf50b380f01d3a83f4ba7670ec1cc79ec7bd4594172f6fb06d3e034b
HEAD_REF master
)

2
ports/tinyxml2/CONTROL
View File

@ -1,3 +1,3 @@
Source: tinyxml2
Version: 6.0.0-2
Version: 6.2.0
Description: A simple, small, efficient, C++ XML parser

4
ports/tinyxml2/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO leethomason/tinyxml2
REF 6.0.0
SHA512 30c68f491830187738b01ca5db1a96e7b4907cf8fa09a533c90ea084ab5e73f798dff6305cfc4edccc8989926e91c0482677bb5796799113c839dbd0528c8ad5
REF 6.2.0
SHA512 ef784240aeb090ab04aad659352ad4b224c431feecf485f33aca7936bcaa0ef4ab9d0a2e0692d3cf6036ac3e8012019d65665e780a920bbad3d4820f736445b1
HEAD_REF master
)

2
ports/unicorn-lib/CONTROL
View File

@ -1,4 +1,4 @@
Source: unicorn-lib
Version: 2018-03-13
Version: 2018-04-09
Description: Unicode library for C++ by Ross Smith
Build-Depends: rs-core-lib, pcre, zlib, libiconv

4
ports/unicorn-lib/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CaptainCrowbar/unicorn-lib
REF 8fc132c879e748a61c9e4b6a93a6de209b55dbe5
SHA512 f70d9fd9c06b4bf7a771abfacd1f989f03ea51395b6819b1162a13954e680d49622e48b61b71195c598ac21861435c6c5fe8ff368880098a07eb4b86547eede0
REF 38b8bfe7b22978d42923a55ed3303a0aadd86abd
SHA512 423dc648476cc957273a7a81770ce5b25452bd685aaa36688cecb1e7cc83495ede6a441fb33e010e80782986c32a8cc87fe42844b0ccd597ce9a4e5286dc6791
HEAD_REF master
)

2
ports/yoga/CONTROL
View File

@ -1,3 +1,3 @@
Source: yoga
Version: 1.7.0-1
Version: 1.8.0-1
Description: Yoga is a cross-platform layout engine which implements Flexbox

4
ports/yoga/portfile.cmake
View File

@ -21,8 +21,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/yoga
REF 1.7.0
SHA512 3472a6db429e1fd0365321b2e663935741c4c97331f3936ea7b590b8218ada567ef7517fb20b1c843c1aad393e2b564e9626170a3d6c25e85450f9e8eb7ffdcc
REF v1.8.0
SHA512 9af0e9e66ce223c99a9cab12721099ca40f85d2fa2a0e0a7d2bcff6d5acc5b6ca0edaaa53e49ec921bf78bb986070702cfe3271c4819147486dad6f6ee93e690
HEAD_REF master
)

2
ports/zeromq/CONTROL
View File

@ -1,3 +1,3 @@
Source: zeromq
Version: 2018-03-29
Version: 2018-04-05
Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products

6
ports/zeromq/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zeromq/libzmq
REF 2aa54d662048f420ac0dbd5d9b46559963a675f2
SHA512 48abea6fdac733ff7c2da7b3f45f129dc904d5d5a59f41f4f47419f5c2483a5227aec1a605d76422071045ea82c76ceb55a521bb80fe5d7f77d5d01c43acb3e6
REF bb4fb32925c6465fd0f8e8cc89e5347bc79bc4bf
SHA512 73101b68d93fdf1eca1f83373fe4c946865978d32ca11692e9015a63af8d42ff2d2ff93c88c812f75c2d80596c986df59e62f8de3dc1a016ab24f91f518c24eb
HEAD_REF master
)
@ -45,6 +45,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
else()
string(REPLACE "get_target_property(ZeroMQ_LIBRARY libzmq LOCATION)" "add_library(libzmq INTERFACE IMPORTED)\nset_target_properties(libzmq PROPERTIES INTERFACE_LINK_LIBRARIES libzmq-static)" _contents "${_contents}")
set(_contents "${_contents}\nset(ZeroMQ_LIBRARY \${ZeroMQ_STATIC_LIBRARY})\n")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/share/zeromq/ZeroMQConfig.cmake "${_contents}")

9
scripts/SHA256Hash.ps1
View File

@ -1,9 +0,0 @@
[CmdletBinding()]
Param(
[Parameter(Mandatory=$True)]
[String]$Value
)
$sha256 = New-Object -TypeName System.Security.Cryptography.SHA256CryptoServiceProvider
$utf8 = New-Object -TypeName System.Text.UTF8Encoding
[System.BitConverter]::ToString($sha256.ComputeHash($utf8.GetBytes($Value)))

99
scripts/VcpkgPowershellUtils.ps1
View File

@ -84,22 +84,22 @@ function vcpkgGetCredentials()
}
}
function vcpkgGetSHA256([Parameter(Mandatory=$true)][string]$filePath)
function vcpkgGetSHA512([Parameter(Mandatory=$true)][string]$filePath)
{
if (vcpkgHasCommand -commandName 'Microsoft.PowerShell.Utility\Get-FileHash')
{
Write-Verbose("Hashing with Microsoft.PowerShell.Utility\Get-FileHash")
$hash = (Microsoft.PowerShell.Utility\Get-FileHash -Path $filePath -Algorithm SHA256).Hash
$hash = (Microsoft.PowerShell.Utility\Get-FileHash -Path $filePath -Algorithm SHA512).Hash
}
elseif(vcpkgHasCommand -commandName 'Pscx\Get-Hash')
{
Write-Verbose("Hashing with Pscx\Get-Hash")
$hash = (Pscx\Get-Hash -Path $filePath -Algorithm SHA256).HashString
$hash = (Pscx\Get-Hash -Path $filePath -Algorithm SHA512).HashString
}
else
{
Write-Verbose("Hashing with .NET")
$hashAlgorithm = [Security.Cryptography.HashAlgorithm]::Create("SHA256")
$hashAlgorithm = [Security.Cryptography.HashAlgorithm]::Create("SHA512")
$fileAsByteArray = [io.File]::ReadAllBytes($filePath)
$hashByteArray = $hashAlgorithm.ComputeHash($fileAsByteArray)
$hash = -Join ($hashByteArray | ForEach-Object {"{0:x2}" -f $_})
@ -108,28 +108,26 @@ function vcpkgGetSHA256([Parameter(Mandatory=$true)][string]$filePath)
return $hash.ToLower()
}
function vcpkgCheckEqualFileHash( [Parameter(Mandatory=$true)][string]$filePath,
[Parameter(Mandatory=$true)][string]$expectedHash,
[Parameter(Mandatory=$true)][string]$actualHash)
function vcpkgCheckEqualFileHash( [Parameter(Mandatory=$true)][string]$url,
[Parameter(Mandatory=$true)][string]$filePath,
[Parameter(Mandatory=$true)][string]$expectedHash)
{
$actualHash = vcpkgGetSHA512 $filePath
if ($expectedHash -ne $actualHash)
{
Write-Host ("`nFile does not have expected hash:`n" +
" url: [ $url ]`n" +
" File path: [ $filePath ]`n" +
" Expected hash: [ $expectedHash ]`n" +
" Actual hash: [ $actualHash ]`n")
throw "Invalid Hash for file $filePath"
throw
}
}
function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
[Parameter(Mandatory=$true)][string]$downloadPath)
[Parameter(Mandatory=$true)][string]$downloadPath,
[Parameter(Mandatory=$true)][string]$sha512)
{
if (Test-Path $downloadPath)
{
return
}
if ($url -match "github")
{
if ([System.Enum]::IsDefined([Net.SecurityProtocolType], "Tls12"))
@ -157,20 +155,64 @@ function vcpkgDownloadFile( [Parameter(Mandatory=$true)][string]$url,
}
$wc.DownloadFile($url, $downloadPartPath)
vcpkgCheckEqualFileHash -url $url -filePath $downloadPartPath -expectedHash $sha512
Move-Item -Path $downloadPartPath -Destination $downloadPath
}
function vcpkgExtractFile( [Parameter(Mandatory=$true)][string]$archivePath,
[Parameter(Mandatory=$true)][string]$destinationDir,
[Parameter(Mandatory=$true)][string]$outFilename)
function vcpkgDownloadFileWithAria2( [Parameter(Mandatory=$true)][string]$aria2exe,
[Parameter(Mandatory=$true)][string]$url,
[Parameter(Mandatory=$true)][string]$downloadPath,
[Parameter(Mandatory=$true)][string]$sha512)
{
vcpkgCreateDirectoryIfNotExists $destinationDir
$output = "$destinationDir\$outFilename"
vcpkgRemoveItem $output
$destinationPartial = "$destinationDir\partially-extracted"
vcpkgCreateParentDirectoryIfNotExists $downloadPath
$downloadPartPath = "$downloadPath.part"
vcpkgRemoveItem $downloadPartPath
$parentDir = split-path -parent $downloadPath
$filename = split-path -leaf $downloadPath
if ((Test-Path $url) -or ($url.StartsWith("file://"))) # if is local file
{
vcpkgDownloadFile $url $downloadPath $sha512
return
}
$ec = vcpkgInvokeCommand "$aria2exe" "--dir `"$parentDir`" --out `"$filename.part`" $url"
if ($ec -ne 0)
{
Write-Host "Could not download $url"
throw
}
vcpkgCheckEqualFileHash -url $url -filePath $downloadPartPath -expectedHash $sha512
Move-Item -Path $downloadPartPath -Destination $downloadPath
}
function vcpkgExtractFileWith7z([Parameter(Mandatory=$true)][string]$sevenZipExe,
[Parameter(Mandatory=$true)][string]$archivePath,
[Parameter(Mandatory=$true)][string]$destinationDir)
{
vcpkgRemoveItem $destinationDir
$destinationPartial = "$destinationDir.partial"
vcpkgRemoveItem $destinationPartial
vcpkgCreateDirectoryIfNotExists $destinationPartial
$ec = vcpkgInvokeCommand "$sevenZipExe" "x `"$archivePath`" -o`"$destinationPartial`" -y"
if ($ec -ne 0)
{
Write-Host "Could not extract $archivePath"
throw
}
Rename-Item -Path "$destinationPartial" -NewName $destinationDir
}
function vcpkgExtractZipFile( [Parameter(Mandatory=$true)][string]$archivePath,
[Parameter(Mandatory=$true)][string]$destinationDir)
{
vcpkgRemoveItem $destinationDir
$destinationPartial = "$destinationDir.partial"
vcpkgRemoveItem $destinationPartial
vcpkgCreateDirectoryIfNotExists $destinationPartial
if (vcpkgHasCommand -commandName 'Microsoft.PowerShell.Archive\Expand-Archive')
{
@ -194,20 +236,7 @@ function vcpkgExtractFile( [Parameter(Mandatory=$true)][string]$archivePath,
}
}
$items = @(Get-ChildItem "$destinationPartial")
$itemCount = $items.Count
if ($itemCount -eq 1)
{
$item = $items | Select-Object -first 1
Write-Host "$item"
Move-Item -Path "$destinationPartial\$item" -Destination $output
vcpkgRemoveItem $destinationPartial
}
else
{
Move-Item -Path "$destinationPartial" -Destination $output
}
Rename-Item -Path "$destinationPartial" -NewName $destinationDir
}
function vcpkgInvokeCommand()

37
scripts/buildsystems/vcpkg.cmake
View File

@ -187,7 +187,7 @@ macro(find_package name)
unset(Boost_USE_STATIC_RUNTIME)
set(Boost_COMPILER "-vc140")
_find_package(${ARGV})
elseif("${name}" STREQUAL "ICU")
elseif("${name}" STREQUAL "ICU" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/unicode/utf.h")
function(_vcpkg_find_in_list)
list(FIND ARGV "COMPONENTS" COMPONENTS_IDX)
set(COMPONENTS_IDX ${COMPONENTS_IDX} PARENT_SCOPE)
@ -198,7 +198,7 @@ macro(find_package name)
else()
_find_package(${ARGV})
endif()
elseif("${name}" STREQUAL "TIFF")
elseif("${name}" STREQUAL "TIFF" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/tiff.h")
_find_package(${ARGV})
find_package(LibLZMA)
if(TARGET TIFF::TIFF)
@ -207,24 +207,7 @@ macro(find_package name)
if(TIFF_LIBRARIES)
list(APPEND TIFF_LIBRARIES ${LIBLZMA_LIBRARIES})
endif()
elseif("${name}" STREQUAL "Freetype")
_find_package(${ARGV})
find_package(ZLIB)
find_package(PNG)
find_package(BZip2)
if(TARGET Freetype::Freetype)
set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2 PNG::PNG ZLIB::ZLIB)
endif()
if(FREETYPE_LIBRARIES)
list(APPEND FREETYPE_LIBRARIES ${BZIP2_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES})
endif()
elseif("${name}" STREQUAL "tinyxml2")
_find_package(${ARGV})
if(TARGET tinyxml2_static AND NOT TARGET tinyxml2)
_add_library(tinyxml2 INTERFACE IMPORTED)
set_target_properties(tinyxml2 PROPERTIES INTERFACE_LINK_LIBRARIES "tinyxml2_static")
endif()
elseif(("${name}" STREQUAL "HDF5" OR "${name}" STREQUAL "hdf5") AND NOT PROJECT_NAME STREQUAL "VTK")
elseif(("${name}" STREQUAL "HDF5" OR "${name}" STREQUAL "hdf5") AND NOT PROJECT_NAME STREQUAL "VTK" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/hdf5.h")
# This is a hack to make VTK work. TODO: find another way to suppress the built-in find module.
_find_package(${ARGV} CONFIG)
# Fill in missing static/shared targets
@ -237,7 +220,7 @@ macro(find_package name)
set_target_properties(hdf5::${HDF5TARGET}-static PROPERTIES INTERFACE_LINK_LIBRARIES "hdf5::${HDF5TARGET}-shared")
endif()
endforeach()
elseif("${name}" STREQUAL "GSL")
elseif("${name}" STREQUAL "GSL" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/gsl")
_find_package(${ARGV})
if(GSL_FOUND AND TARGET GSL::gsl)
set_property( TARGET GSL::gslcblas APPEND PROPERTY IMPORTED_CONFIGURATIONS Release )
@ -249,7 +232,7 @@ macro(find_package name)
set_target_properties( GSL::gslcblas PROPERTIES IMPORTED_LOCATION_DEBUG "${GSL_CBLAS_LIBRARY_DEBUG}" )
endif()
endif()
elseif("${name}" STREQUAL "CURL")
elseif("${name}" STREQUAL "CURL" AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/curl")
_find_package(${ARGV})
if(CURL_FOUND)
if(EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/nghttp2.lib")
@ -258,16 +241,6 @@ macro(find_package name)
"optimized" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/nghttp2.lib")
endif()
endif()
elseif("${name}" STREQUAL "LibXml2")
_find_package(${ARGV})
if(LibXml2_FOUND AND (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
list(APPEND LIBXML2_LIBRARIES
debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libiconv.lib
optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libiconv.lib
debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/libcharset.lib
optimized ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/libcharset.lib
ws2_32)
endif()
else()
_find_package(${ARGV})
endif()

28
scripts/cmake/vcpkg_build_cmake.cmake
View File

@ -105,6 +105,7 @@ function(vcpkg_build_cmake)
if(out_contents MATCHES "LINK : fatal error LNK1102:" OR out_contents MATCHES " fatal error C1060: ")
# The linker ran out of memory during execution. We will try continuing once more, with parallelism disabled.
message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} without parallelism because memory exceeded")
execute_process(
COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${NO_PARALLEL_ARG}
OUTPUT_FILE "${LOGPREFIX}-out-1.log"
@ -123,6 +124,33 @@ function(vcpkg_build_cmake)
list(APPEND LOGS "${LOGPREFIX}-err-1.log")
endif()
endif()
elseif(out_contents MATCHES ": No such file or directory")
# WSL workaround - WSL occassionally fails with no such file or directory. Detect if we are running in WSL and restart.
execute_process(COMMAND "uname" "-r"
OUTPUT_VARIABLE UNAME_R ERROR_VARIABLE UNAME_R
OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
if (UNAME_R MATCHES "Microsoft")
message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of (potential) wsl subsystem issue.")
execute_process(
COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS}
OUTPUT_FILE "${LOGPREFIX}-out-1.log"
ERROR_FILE "${LOGPREFIX}-err-1.log"
RESULT_VARIABLE error_code
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE})
if(error_code)
file(READ "${LOGPREFIX}-out-1.log" out_contents)
file(READ "${LOGPREFIX}-err-1.log" err_contents)
if(out_contents)
list(APPEND LOGS "${LOGPREFIX}-out-1.log")
endif()
if(err_contents)
list(APPEND LOGS "${LOGPREFIX}-err-1.log")
endif()
endif()
endif()
endif()
if(error_code)

1
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -165,6 +165,7 @@ function(vcpkg_configure_cmake)
list(APPEND _csc_OPTIONS
"-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}"
"-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}"
"-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON"
"-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"
"-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON"

13
scripts/cmake/vcpkg_find_acquire_program.cmake
View File

@ -116,7 +116,7 @@ function(vcpkg_find_acquire_program VAR)
if(CMAKE_HOST_WIN32)
set(PATHS "${DOWNLOADS}/tools/ninja/${SUBDIR}")
else()
set(PATHS "${DOWNLOADS}/tools/${SUBDIR}")
set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-linux")
endif()
set(BREW_PACKAGE_NAME "ninja")
set(APT_PACKAGE_NAME "ninja-build")
@ -218,19 +218,20 @@ function(vcpkg_find_acquire_program VAR)
FILENAME ${ARCHIVE}
)
file(MAKE_DIRECTORY ${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR})
set(PROG_PATH_SUBDIR "${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR}")
file(MAKE_DIRECTORY ${PROG_PATH_SUBDIR})
if(DEFINED NOEXTRACT)
if(DEFINED _vfa_RENAME)
file(INSTALL ${ARCHIVE_PATH} DESTINATION ${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR} RENAME ${_vfa_RENAME})
file(INSTALL ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} RENAME ${_vfa_RENAME})
else()
file(COPY ${ARCHIVE_PATH} DESTINATION ${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR})
file(COPY ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR})
endif()
else()
get_filename_component(ARCHIVE_EXTENSION ${ARCHIVE} EXT)
string(TOLOWER "${ARCHIVE_EXTENSION}" ARCHIVE_EXTENSION)
if(ARCHIVE_EXTENSION STREQUAL ".msi")
file(TO_NATIVE_PATH "${ARCHIVE_PATH}" ARCHIVE_NATIVE_PATH)
file(TO_NATIVE_PATH "${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR}" DESTINATION_NATIVE_PATH)
file(TO_NATIVE_PATH "${PROG_PATH_SUBDIR}" DESTINATION_NATIVE_PATH)
execute_process(
COMMAND msiexec /a ${ARCHIVE_NATIVE_PATH} /qn TARGETDIR=${DESTINATION_NATIVE_PATH}
WORKING_DIRECTORY ${DOWNLOADS}
@ -238,7 +239,7 @@ function(vcpkg_find_acquire_program VAR)
else()
execute_process(
COMMAND ${CMAKE_COMMAND} -E tar xzf ${ARCHIVE_PATH}
WORKING_DIRECTORY ${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR}
WORKING_DIRECTORY ${PROG_PATH_SUBDIR}
)
endif()
endif()

55
scripts/fetchTool.ps1
View File

@ -22,43 +22,74 @@ function fetchToolInternal([Parameter(Mandatory=$true)][string]$tool)
if ($toolData -eq $null)
{
throw "Unkown tool $tool"
throw "Unknown tool $tool"
}
$exePath = "$downloadsDir\$($toolData.exeRelativePath)"
$toolPath="$downloadsDir\tools\$tool-$($toolData.version)-windows"
$exePath = "$toolPath\$($toolData.exeRelativePath)"
if (Test-Path $exePath)
{
return $exePath
}
$isArchive = vcpkgHasProperty -object $toolData -propertyName "archiveRelativePath"
$isArchive = vcpkgHasProperty -object $toolData -propertyName "archiveName"
if ($isArchive)
{
$downloadPath = "$downloadsDir\$($toolData.archiveRelativePath)"
$downloadPath = "$downloadsDir\$($toolData.archiveName)"
}
else
{
$downloadPath = "$downloadsDir\$($toolData.exeRelativePath)"
$downloadPath = "$toolPath\$($toolData.exeRelativePath)"
}
[String]$url = $toolData.url
if (!(Test-Path $downloadPath))
{
Write-Host "Downloading $tool..."
vcpkgDownloadFile $url $downloadPath
# Download aria2 with .NET. aria2 will be used to download everything else.
if ($tool -eq "aria2")
{
vcpkgDownloadFile $url $downloadPath $toolData.sha512
}
else
{
$aria2exe = fetchToolInternal "aria2"
vcpkgDownloadFileWithAria2 $aria2exe $url $downloadPath $toolData.sha512
}
Write-Host "Downloading $tool... done."
}
$expectedDownloadedFileHash = $toolData.sha256
$downloadedFileHash = vcpkgGetSHA256 $downloadPath
vcpkgCheckEqualFileHash -filePath $downloadPath -expectedHash $expectedDownloadedFileHash -actualHash $downloadedFileHash
else
{
vcpkgCheckEqualFileHash -url $url -filePath $downloadPath -expectedHash $toolData.sha512
}
if ($isArchive)
{
$outFilename = (Get-ChildItem $downloadPath).BaseName
Write-Host "Extracting $tool..."
vcpkgExtractFile -ArchivePath $downloadPath -DestinationDir $downloadsDir -outFilename $outFilename
# Extract 7zip920 with shell because we need it to extract 7zip
# Extract aria2 with shell because we need it to download 7zip
if ($tool -eq "7zip920" -or $tool -eq "aria2")
{
vcpkgExtractZipFile -ArchivePath $downloadPath -DestinationDir $toolPath
}
elseif ($tool -eq "7zip")
{
$sevenZip920 = fetchToolInternal "7zip920"
$ec = vcpkgInvokeCommand "$sevenZip920" "x `"$downloadPath`" -o`"$toolPath`" -y"
if ($ec -ne 0)
{
Write-Host "Could not extract $downloadPath"
throw
}
}
else
{
$sevenZipExe = fetchToolInternal "7zip"
vcpkgExtractFileWith7z -sevenZipExe "$sevenZipExe" -ArchivePath $downloadPath -DestinationDir $toolPath
}
Write-Host "Extracting $tool... done."
}

13
scripts/toolchains/windows.cmake
View File

@ -9,8 +9,17 @@ if(NOT _CMAKE_IN_TRY_COMPILE)
message(FATAL_ERROR "Invalid setting for VCPKG_CRT_LINKAGE: \"${VCPKG_CRT_LINKAGE}\". It must be \"static\" or \"dynamic\"")
endif()
set(CMAKE_CXX_FLAGS " /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP ${VCPKG_CXX_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS " /DWIN32 /D_WINDOWS /W3 /utf-8 /MP ${VCPKG_C_FLAGS}" CACHE STRING "")
set(CHARSET_FLAG "/utf-8")
if(VCPKG_PLATFORM_TOOLSET MATCHES "v120")
# VS 2013 does not support /utf-8
set(CHARSET_FLAG)
endif()
set(CMAKE_CXX_FLAGS " /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /GR /EHsc /MP ${VCPKG_CXX_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS " /DWIN32 /D_WINDOWS /W3 ${CHARSET_FLAG} /MP ${VCPKG_C_FLAGS}" CACHE STRING "")
set(CMAKE_RC_FLAGS "-c65001 /DWIN32" CACHE STRING "")
unset(CHARSET_FLAG)
set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}" CACHE STRING "")
set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG ${VCPKG_CRT_LINK_FLAG_PREFIX}d /Z7 /Ob0 /Od /RTC1 ${VCPKG_C_FLAGS_DEBUG}" CACHE STRING "")

98
scripts/vcpkgTools.xml
View File

@ -1,71 +1,85 @@
<?xml version="1.0"?>
<tools version="1">
<tool name="cmake">
<requiredVersion>3.10.2</requiredVersion>
<tools version="2">
<tool name="cmake" os="windows">
<version>3.10.2</version>
<exeRelativePath>cmake-3.10.2-win32-x86\bin\cmake.exe</exeRelativePath>
<url>https://cmake.org/files/v3.10/cmake-3.10.2-win32-x86.zip</url>
<sha256>f5f7e41a21d0e9b655aca58498b08e17ecd27796bf82837e2c84435359169dd6</sha256>
<archiveRelativePath>cmake-3.10.2-win32-x86.zip</archiveRelativePath>
<sha512>9c16861a2ac09c7011b84f38459ecfec2829a9f825b254acbbde46d98f12f8ca0d4db3a6764758cb671507ee7c0327576d87658b81d7ddf1e8280b37569eb16d</sha512>
<archiveName>cmake-3.10.2-win32-x86.zip</archiveName>
</tool>
<tool name="cmake" os="osx">
<requiredVersion>3.10.2</requiredVersion>
<version>3.10.2</version>
<exeRelativePath>cmake-3.10.2-Darwin-x86_64/CMake.app/Contents/bin/cmake</exeRelativePath>
<url>https://cmake.org/files/v3.10/cmake-3.10.2-Darwin-x86_64.tar.gz</url>
<sha256>e748eb7698f8e2783c2eea9ab81eebf66da0238bbf8e8fa722a67a38f2110718</sha256>
<archiveRelativePath>cmake-3.10.2-Darwin-x86_64.tar.gz</archiveRelativePath>
<sha512>cb7d76e11c892eb786da5804282c4141564390c3552e08c506c7abb93015eb5f619c55255459872b219399ce8114ac321fe92df7f82a7e42bbc874eec240571e</sha512>
<archiveName>cmake-3.10.2-Darwin-x86_64.tar.gz</archiveName>
</tool>
<tool name="cmake" os="linux">
<requiredVersion>3.10.2</requiredVersion>
<version>3.10.2</version>
<exeRelativePath>cmake-3.10.2-Linux-x86_64/bin/cmake</exeRelativePath>
<url>https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz</url>
<sha256>7a82b46c35f4e68a0807e8dc04e779dee3f36cd42c6387fd13b5c29fe62a69ea</sha256>
<archiveRelativePath>cmake-3.10.2-Linux-x86_64.tar.gz</archiveRelativePath>
<sha512>54389b5cb3f3cb9d182d35e0b1eaf7b301695899930da0d26e9df1dc25056213a077646d23ea609a93daa81d30687757d9cf0dc263339fa3d73dbeb1284bc1a9</sha512>
<archiveName>cmake-3.10.2-Linux-x86_64.tar.gz</archiveName>
</tool>
<tool name="git">
<requiredVersion>2.16.2</requiredVersion>
<exeRelativePath>MinGit-2.16.2-32-bit\cmd\git.exe</exeRelativePath>
<tool name="git" os="windows">
<version>2.16.2</version>
<exeRelativePath>cmd\git.exe</exeRelativePath>
<url>https://github.com/git-for-windows/git/releases/download/v2.16.2.windows.1/MinGit-2.16.2-32-bit.zip</url>
<sha256>322c727e482aa97522c64a5ac68bdda3780111e8670bcfb532beac8e11ece5da</sha256>
<archiveRelativePath>MinGit-2.16.2-32-bit.zip</archiveRelativePath>
<sha512>004e1dc1904f2e2d5c3534d0a56f58bf030b1146f5b263d6d191e60f72cd35455977c588604708125a1e93268ee8f7a5ab32ed6115adc028257b12d5926f350a</sha512>
<archiveName>MinGit-2.16.2-32-bit.zip</archiveName>
</tool>
<tool name="vswhere">
<requiredVersion>2.3.2</requiredVersion>
<exeRelativePath>vswhere-2.3.2\vswhere.exe</exeRelativePath>
<url>https://github.com/Microsoft/vswhere/releases/download/2.3.2/vswhere.exe</url>
<sha256>103f2784c4b2c8e70c7c1c03687abbf22bce052aae30639406e4e13ffa29ee04</sha256>
<tool name="vswhere" os="windows">
<version>2.4.1</version>
<exeRelativePath>vswhere.exe</exeRelativePath>
<url>https://github.com/Microsoft/vswhere/releases/download/2.4.1/vswhere.exe</url>
<sha512>f477842d0cebefcd6bf9c6d536ab8ea20ec5b0aa967ee963ab6a101aeff9df8742ca600d35f39e2e7158d76d8231f1ed2bef6104dce84d2bf8d6b07d17d706a1</sha512>
</tool>
<tool name="nuget">
<requiredVersion>4.4.0</requiredVersion>
<exeRelativePath>nuget-4.4.0\nuget.exe</exeRelativePath>
<url>https://dist.nuget.org/win-x86-commandline/v4.4.0/nuget.exe</url>
<sha256>2cf9b118937eef825464e548f0c44f7f64090047746de295d75ac3dcffa3e1f6</sha256>
<tool name="nuget" os="windows">
<version>4.6.2</version>
<exeRelativePath>nuget.exe</exeRelativePath>
<url>https://dist.nuget.org/win-x86-commandline/v4.6.2/nuget.exe</url>
<sha512>60daea7bec2de23089f7ad73985dd788ac154171d6326c2c456726849b8f97dfc38cbdd9b9bf8d96aced009ccaaed317905b65c108e149cfbbbcdfb95f8f0519</sha512>
</tool>
<tool name="installerbase">
<requiredVersion>3.1.81</requiredVersion>
<tool name="installerbase" os="windows">
<version>3.1.81</version>
<exeRelativePath>QtInstallerFramework-win-x86\bin\installerbase.exe</exeRelativePath>
<url>https://github.com/podsvirov/installer-framework/releases/download/cr203958-9/QtInstallerFramework-win-x86.zip</url>
<sha256>f2ce23cf5cf9fc7ce409bdca49328e09a070c0026d3c8a04e4dfde7b05b83fe8</sha256>
<archiveRelativePath>QtInstallerFramework-win-x86.zip</archiveRelativePath>
<sha512>1f3e593270d7c2a4e271fdb49c637a2de462351310ef66bba298d30f6ca23365ec6aecf2e57799a00c873267cd3f92060ecac03eb291d42903d0e0869cd17c73</sha512>
<archiveName>QtInstallerFramework-win-x86.zip</archiveName>
</tool>
<tool name="7zip">
<requiredVersion>18.01.0</requiredVersion>
<exeRelativePath>7za920\7za.exe</exeRelativePath>
<url>http://www.7-zip.org/a/7za920.zip</url>
<sha256>2a3afe19c180f8373fa02ff00254d5394fec0349f5804e0ad2f6067854ff28ac</sha256>
<archiveRelativePath>7za920.zip</archiveRelativePath>
<tool name="7zip" os="windows">
<version>18.01.0</version>
<exeRelativePath>7za.exe</exeRelativePath>
<url>https://www.7-zip.org/a/7z1801-extra.7z</url>
<sha512>9133fc551d76515e37fdd4dd8c1e28d464aea493548246b44565a42bba46715764f41f9cfa14d470d298c3a6e9829d200f8be5168cb67cf8f23d8042fca833bc</sha512>
<archiveName>7z1801-extra.7z</archiveName>
</tool>
<tool name="7zip920" os="windows">
<version>9.20.0</version>
<exeRelativePath>7za.exe</exeRelativePath>
<url>https://www.7-zip.org/a/7za920.zip</url>
<sha512>84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3</sha512>
<archiveName>7za920.zip</archiveName>
</tool>
<tool name="aria2" os="windows">
<version>18.01.0</version>
<exeRelativePath>aria2-1.33.1-win-32bit-build1\aria2c.exe</exeRelativePath>
<url>https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1-win-32bit-build1.zip</url>
<sha512>2456176ba3d506a07cf0cc4f61f080e1ff8cb4106426d66f354c5bb67a9a8720b5ddb26904275e61b1f623c932355f7dcde4cd17556cc895f11293c23c3a9bf3</sha512>
<archiveName>aria2-1.33.1-win-32bit-build1.zip</archiveName>
</tool>
<tool name="ninja" os="linux">
<requiredVersion>1.8.2</requiredVersion>
<version>1.8.2</version>
<exeRelativePath>ninja</exeRelativePath>
<url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip</url>
<sha256>d2fea9ff33b3ef353161ed906f260d565ca55b8ca0568fa07b1d2cab90a84a07</sha256>
<archiveRelativePath>ninja-linux.zip</archiveRelativePath>
<sha512>38fcb68e745c1f15b4b50f20069ffe686b1ef5baf93b74958e132ea5d30d155cf6970d6dc1b095aafd421ebd8bcc63acf4f64e305c496266b5182f99b815cca5</sha512>
<archiveName>ninja-linux.zip</archiveName>
</tool>
<tool name="ninja" os="osx">
<requiredVersion>1.8.2</requiredVersion>
<version>1.8.2</version>
<exeRelativePath>ninja</exeRelativePath>
<url>https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip</url>
<sha256>0347d55c66061652b26f48769d566761630ffde3143793b29064a57f356542cc</sha256>
<archiveRelativePath>ninja-mac.zip</archiveRelativePath>
<sha512>acadfb286eb7d93676629701917fa0c3c39f36daa068c169e4a098c29f97380d1ea95abfd42b04798ff118fd9dc93fdb250fcda36086bac20bc5506354214fc3</sha512>
<archiveName>ninja-mac.zip</archiveName>
</tool>
</tools>

3
toolsrc/CMakeLists.txt
View File

@ -23,6 +23,9 @@ endif()
if(GCC OR CLANG)
add_compile_options(-std=c++1z)
if(WERROR)
add_compile_options(-Wall -Wno-unknown-pragmas -Werror)
endif()
endif()
file(GLOB_RECURSE VCPKGLIB_SOURCES src/vcpkg/*.cpp)

2
toolsrc/VERSION.txt
View File

@ -1 +1 @@
"0.0.107"
"0.0.108"

Some files were not shown because too many files have changed in this diff Show More