mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 05:11:48 +08:00
Merge from master
This commit is contained in:
commit
17c9b6bac8
864
CHANGELOG.md
864
CHANGELOG.md
@ -1,3 +1,867 @@
|
||||
vcpkg (2019.09.30)
|
||||
---
|
||||
#### Total port count: 1225
|
||||
#### Total port count per triplet (tested):
|
||||
|triplet|ports available|
|
||||
|---|---|
|
||||
|**x64-windows**|1151|
|
||||
|x86-windows|1136|
|
||||
|x64-windows-static|1061|
|
||||
|**x64-linux**|980|
|
||||
|**x64-osx**|939|
|
||||
|arm64-windows|766|
|
||||
|x64-uwp|624|
|
||||
|arm-uwp|594|
|
||||
|
||||
#### The following commands and options have been updated:
|
||||
- `x-history` ***[NEW COMMAND]***
|
||||
- Shows the full history of CONTROL version of a port, including the vcpkg commit hash, CONTROL version, and date of vcpkg commit
|
||||
- [(#7377)](https://github.com/microsoft/vcpkg/pull/7377) [x-history] Prints CONTROL version history of a port 👻
|
||||
- [(#8101)](https://github.com/microsoft/vcpkg/pull/8101) fix x-history help desc.
|
||||
- `depend-info`
|
||||
- Constrain argument count to single port name as usage intends
|
||||
- [(#8135)](https://github.com/microsoft/vcpkg/pull/8135) [vcpkg] Fix `depend-info` command arguments arity
|
||||
|
||||
#### The following documentation has been updated:
|
||||
- [Frequently Asked Questions](docs/about/faq.md)
|
||||
- [(#8258)](https://github.com/microsoft/vcpkg/pull/8258) Add detailed instructions for custom configurations
|
||||
- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md)
|
||||
- [(#8383)](https://github.com/microsoft/vcpkg/pull/8383) Fix a typo in maintainer-guide.md
|
||||
|
||||
#### The following *remarkable* changes have been made to vcpkg's infrastructure:
|
||||
- Add port features to CI test result XML as the first step in testing them in CI system
|
||||
- [(#8342)](https://github.com/microsoft/vcpkg/pull/8342) [CI system] Add features to test result xml
|
||||
|
||||
#### The following *additional* changes have been made to vcpkg's infrastructure:
|
||||
- [(#8048)](https://github.com/microsoft/vcpkg/pull/8048) Add August changelog
|
||||
- [(#8082)](https://github.com/microsoft/vcpkg/pull/8082) [vcpkg] remove text from license
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#7954)](https://github.com/microsoft/vcpkg/pull/7954) Fix bug in `.vcpkg-root` detection that breaks `--overlay-triplets`
|
||||
- [(#8131)](https://github.com/microsoft/vcpkg/pull/8131) [vcpkg] add missing implib definitions, fix shared lib extension on mac
|
||||
- [(#8129)](https://github.com/microsoft/vcpkg/pull/8129) [vcpkg] Continue on malformed paths in PATH
|
||||
- [(#8200)](https://github.com/microsoft/vcpkg/pull/8200) [vcpkg] Fix missing VCPKG_ROOT_PATH in create command
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
- [(#5180)](https://github.com/microsoft/vcpkg/pull/5180) Use CMAKE_TRY_COMPILE_PLATFORM_VARIABLES to propagate values
|
||||
- [(#8032)](https://github.com/microsoft/vcpkg/pull/8032) [vcpkg] Avoid RENAME usage to prevent cross-device link problems (#4245)
|
||||
- [(#8304)](https://github.com/microsoft/vcpkg/pull/8304) [ports.cmake] Fixup capitalization inconsistencies of Windows drive letter
|
||||
|
||||
<details>
|
||||
<summary><b>The following 55 ports have been added:</b></summary>
|
||||
|
||||
|port|version|
|
||||
|---|---|
|
||||
|[dmlc](https://github.com/microsoft/vcpkg/pull/7549)| 2019-08-12
|
||||
|[anyrpc](https://github.com/microsoft/vcpkg/pull/7438)| 2017-12-01
|
||||
|[imgui-sfml](https://github.com/microsoft/vcpkg/pull/7429)<sup>[#8004](https://github.com/microsoft/vcpkg/pull/8004) </sup>| 2.1
|
||||
|[ignition-cmake0](https://github.com/microsoft/vcpkg/pull/7781)<sup>[#8044](https://github.com/microsoft/vcpkg/pull/8044) [#8136](https://github.com/microsoft/vcpkg/pull/8136) </sup>| 0.6.2-1
|
||||
|[ignition-math4](https://github.com/microsoft/vcpkg/pull/7781)| 4.0.0
|
||||
|[ignition-modularscripts](https://github.com/microsoft/vcpkg/pull/7781)<sup>[#8136](https://github.com/microsoft/vcpkg/pull/8136) </sup>| 2019-09-11
|
||||
|[volk](https://github.com/microsoft/vcpkg/pull/8035)<sup>[#8364](https://github.com/microsoft/vcpkg/pull/8364) </sup>| 2019-09-26
|
||||
|[cppkafka](https://github.com/microsoft/vcpkg/pull/7987)<sup>[#8073](https://github.com/microsoft/vcpkg/pull/8073) </sup>| 0.3.1-1
|
||||
|[nativefiledialog](https://github.com/microsoft/vcpkg/pull/7944)| 2019-08-28
|
||||
|[cello](https://github.com/microsoft/vcpkg/pull/7386)| 2019-07-23
|
||||
|[libhydrogen](https://github.com/microsoft/vcpkg/pull/7436)| 2019-08-11
|
||||
|[quantlib](https://github.com/microsoft/vcpkg/pull/7283)| 2019-09-02
|
||||
|[magic-get](https://github.com/microsoft/vcpkg/pull/8072)| 2019-09-02
|
||||
|[cityhash](https://github.com/microsoft/vcpkg/pull/7879)| 2013-01-08
|
||||
|[ignition-common1](https://github.com/microsoft/vcpkg/pull/8111)| 1.1.1
|
||||
|[wampcc](https://github.com/microsoft/vcpkg/pull/7929)| 2019-09-04
|
||||
|[hidapi](https://github.com/microsoft/vcpkg/pull/8113)| 2019-08-30
|
||||
|[sokol](https://github.com/microsoft/vcpkg/pull/8107)| 2019-09-09
|
||||
|[parallelstl](https://github.com/microsoft/vcpkg/pull/8039)| 20190522-1
|
||||
|[marl](https://github.com/microsoft/vcpkg/pull/8132)<sup>[#8161](https://github.com/microsoft/vcpkg/pull/8161) </sup>| 2019-09-13
|
||||
|[vectorclass](https://github.com/microsoft/vcpkg/pull/7573)| 2.00.01
|
||||
|[wren](https://github.com/microsoft/vcpkg/pull/7242)| 2019-07-01
|
||||
|[libsrtp](https://github.com/microsoft/vcpkg/pull/8046)| 2.2.0
|
||||
|[ignition-msgs1](https://github.com/microsoft/vcpkg/pull/8044)| 1.0.0
|
||||
|[ignition-transport4](https://github.com/microsoft/vcpkg/pull/8044)| 4.0.0
|
||||
|[argtable3](https://github.com/microsoft/vcpkg/pull/7815)| 2019-08-21
|
||||
|[llgl](https://github.com/microsoft/vcpkg/pull/7701)| 2019-08-15
|
||||
|[sdformat6](https://github.com/microsoft/vcpkg/pull/8137)| 6.2.0
|
||||
|[grppi](https://github.com/microsoft/vcpkg/pull/8125)| 0.4.0
|
||||
|[opencolorio](https://github.com/microsoft/vcpkg/pull/8006)| 1.1.1
|
||||
|[cpputest](https://github.com/microsoft/vcpkg/pull/8188)| 2019-9-16
|
||||
|[winreg](https://github.com/microsoft/vcpkg/pull/8190)<sup>[#8371](https://github.com/microsoft/vcpkg/pull/8371) </sup>| 1.2.1-1
|
||||
|[zfp](https://github.com/microsoft/vcpkg/pull/7955)| 0.5.5-1
|
||||
|[libyuv](https://github.com/microsoft/vcpkg/pull/7486)| fec9121
|
||||
|[foonathan-memory](https://github.com/microsoft/vcpkg/pull/7350)<sup>[#8266](https://github.com/microsoft/vcpkg/pull/8266) </sup>| 2019-07-21-1
|
||||
|[jinja2cpplight](https://github.com/microsoft/vcpkg/pull/8207)| 2018-05-08
|
||||
|[liblbfgs](https://github.com/microsoft/vcpkg/pull/8186)| 1.10
|
||||
|[sigslot](https://github.com/microsoft/vcpkg/pull/8262)| 1.0.0
|
||||
|[cute-headers](https://github.com/microsoft/vcpkg/pull/8277)| 2019-09-20
|
||||
|[libsoundio](https://github.com/microsoft/vcpkg/pull/8273)| 2.0.0
|
||||
|[matplotlib-cpp](https://github.com/microsoft/vcpkg/pull/8313)| 2019-09-24
|
||||
|[asynch](https://github.com/microsoft/vcpkg/pull/8317)<sup>[#8371](https://github.com/microsoft/vcpkg/pull/8371) </sup>| 2019-09-21-1
|
||||
|[minimp3](https://github.com/microsoft/vcpkg/pull/8319)<sup>[#8371](https://github.com/microsoft/vcpkg/pull/8371) </sup>| 2019-07-24-1
|
||||
|[crfsuite](https://github.com/microsoft/vcpkg/pull/8233)| 2019-07-21
|
||||
|[cudnn](https://github.com/microsoft/vcpkg/pull/7536)| 7.6
|
||||
|[libosip2](https://github.com/microsoft/vcpkg/pull/8261)| 5.1.0
|
||||
|[portable-snippets](https://github.com/microsoft/vcpkg/pull/7783)| 2019-09-20
|
||||
|[ignition-fuel-tools1](https://github.com/microsoft/vcpkg/pull/8136)| 1.2.0
|
||||
|[clickhouse-cpp](https://github.com/microsoft/vcpkg/pull/7880)| 2019-05-22
|
||||
|[tweeny](https://github.com/microsoft/vcpkg/pull/8341)| 3.0
|
||||
|[nanogui](https://github.com/microsoft/vcpkg/pull/8302)| 2019-09-23
|
||||
|[wepoll](https://github.com/microsoft/vcpkg/pull/8280)| 1.5.5
|
||||
|[tcl](https://github.com/microsoft/vcpkg/pull/8026)| 8.6.5
|
||||
|[cpuinfo](https://github.com/microsoft/vcpkg/pull/7449)| 2019-07-28
|
||||
|[mathc](https://github.com/microsoft/vcpkg/pull/8394)| 2019-09-29
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><b>The following 220 ports have been updated:</b></summary>
|
||||
|
||||
- breakpad `2019-07-11` -> `2019-07-11-1`
|
||||
- [(#7938)](https://github.com/microsoft/vcpkg/pull/7938) [breakpad] Fix build failed with Visual Studio 2019
|
||||
|
||||
- gtest `2019-08-14-1` -> `2019-08-14-2`
|
||||
- [(#7887)](https://github.com/microsoft/vcpkg/pull/7887) [gtest]Re-fix gmock target.
|
||||
|
||||
- libxslt `1.1.33` -> `1.1.33-2`
|
||||
- [(#7451)](https://github.com/microsoft/vcpkg/pull/7451) [libxslt]Fix dependent ports in static builds.
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- pcre2 `10.30-4` -> `10.30-5`
|
||||
- [(#7948)](https://github.com/microsoft/vcpkg/pull/7948) Fix build with Emscripten/WASM
|
||||
|
||||
- entt `3.0.0-1` -> `3.1.1`
|
||||
- [(#7984)](https://github.com/microsoft/vcpkg/pull/7984) [entt] Update to 3.1.0
|
||||
- [(#8098)](https://github.com/microsoft/vcpkg/pull/8098) [entt] Update to 3.1.1
|
||||
|
||||
- raylib `2019-04-27-2` -> `2.5.0`
|
||||
- [(#7848)](https://github.com/microsoft/vcpkg/pull/7848) [raylib] update to 2.5.0
|
||||
|
||||
- jsoncons `0.132.1` -> `0.136.0`
|
||||
- [(#8034)](https://github.com/microsoft/vcpkg/pull/8034) [jsoncons] Update to version 0.133.0
|
||||
- [(#8221)](https://github.com/microsoft/vcpkg/pull/8221) [jsoncons] Update to v0.134.0
|
||||
- [(#8348)](https://github.com/microsoft/vcpkg/pull/8348) [jsoncons] Update jsoncons to v0.135.0
|
||||
- [(#8382)](https://github.com/microsoft/vcpkg/pull/8382) [jsoncons] Update jsoncons to v0.136.0
|
||||
|
||||
- exiv2 `0.27.1-1` -> `0.27.2-1`
|
||||
- [(#7992)](https://github.com/microsoft/vcpkg/pull/7992) [exiv2] Update library to 0.27.2
|
||||
|
||||
- gettext `0.19-10` -> `0.19-11`
|
||||
- [(#7990)](https://github.com/microsoft/vcpkg/pull/7990) [gettext]Improve gettext on Linux.
|
||||
|
||||
- wtl `10.0-2` -> `10.0-3`
|
||||
- [(#8005)](https://github.com/microsoft/vcpkg/pull/8005) Update WTL to 10.0.9163.
|
||||
|
||||
- aixlog `1.2.1` -> `1.2.1-1`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- chaiscript `6.1.0` -> `6.1.0-1`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- dlfcn-win32 `1.1.1-2` -> `1.1.1-3`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- enet `1.3.13` -> `1.3.13-1`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- fltk `1.3.4-6` -> `1.3.4-7`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- fmi4cpp `0.7.0-1` -> `0.7.0-2`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- fmilib `2.0.3-1` -> `2.0.3-2`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- freetds `1.1.6` -> `1.1.6-1`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- gainput `1.0.0-1` -> `1.0.0-2`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- geographiclib `1.47-patch1-7` -> `1.47-patch1-9`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
- [(#8115)](https://github.com/microsoft/vcpkg/pull/8115) [geographiclib]Fix usage error and cmake path in Linux.
|
||||
|
||||
- glog `0.4.0-1` -> `0.4.0-2`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- irrlicht `1.8.4-1` -> `1.8.4-2`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- libmikmod `3.3.11.1-4` -> `3.3.11.1-5`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- libodb-mysql `2.4.0-3` -> `2.4.0-4`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- libodb-sqlite `2.4.0-4` -> `2.4.0-5`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- libodb `2.4.0-5` -> `2.4.0-6`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- libsquish `1.15-1` -> `1.15-2`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- lzo `2.10-2` -> `2.10-3`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- nanovg `master` -> `2019-8-30-1`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
- [(#8302)](https://github.com/microsoft/vcpkg/pull/8302) [nanogui] Add new port
|
||||
|
||||
- ode `0.15.1-1` -> `0.15.1-2`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- opencsg `1.4.2` -> `1.4.2-1`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- orocos-kdl `1.4-1` -> `1.4-2`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- pangomm `2.40.1` -> `2.40.1-1`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- pcre `8.41-2` -> `8.41-3`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- qt5-gamepad `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- wavpack `5.1.0-00d9a4a-1` -> `5.1.0-2`
|
||||
- [(#7986)](https://github.com/microsoft/vcpkg/pull/7986) modernize many ports
|
||||
|
||||
- tensorflow-cc `1.14` -> `1.14-1`
|
||||
- [(#8023)](https://github.com/microsoft/vcpkg/pull/8023) [tensorflow-cc]Fix build error and add warning message.
|
||||
|
||||
- glew `2.1.0-5` -> `2.1.0-6`
|
||||
- [(#7967)](https://github.com/microsoft/vcpkg/pull/7967) [VTK/GLEW] Fix Regression of VTK with newer CMake Versions
|
||||
|
||||
- libpq `9.6.1-7` -> `9.6.1-8`
|
||||
- [(#8076)](https://github.com/microsoft/vcpkg/pull/8076) libpq requires HAVE_CRYPTO_LOCK for thread safety with openssl <1.1.0
|
||||
- [(#8080)](https://github.com/microsoft/vcpkg/pull/8080) [libpq] #undef int128 type if compiling for 32 bit architecture
|
||||
- [(#8090)](https://github.com/microsoft/vcpkg/pull/8090) [libpq] Bump version number
|
||||
|
||||
- sobjectizer `5.6.0.2` -> `5.6.1`
|
||||
- [(#8052)](https://github.com/microsoft/vcpkg/pull/8052) [sobjectizer] updated to 5.6.1
|
||||
|
||||
- unrar `5.5.8-2` -> `5.8.1`
|
||||
- [(#8053)](https://github.com/microsoft/vcpkg/pull/8053) [unrar] Don't use a custom struct member alignment
|
||||
- [(#8108)](https://github.com/microsoft/vcpkg/pull/8108) [unrar] Update to 5.8.1
|
||||
|
||||
- xalan-c `1.11-7` -> `1.11-8`
|
||||
- [(#7795)](https://github.com/microsoft/vcpkg/pull/7795) [xalan-c] fixed cmake files location
|
||||
|
||||
- re2 `2019-08-01` -> `2019-09-01`
|
||||
- [(#8089)](https://github.com/microsoft/vcpkg/pull/8089) [re2] Update library to 2019-09-01
|
||||
|
||||
- libvpx `1.7.0-3` -> `1.8.1`
|
||||
- [(#8086)](https://github.com/microsoft/vcpkg/pull/8086) [libvpx] Update to 1.8.1.
|
||||
- [(#8100)](https://github.com/microsoft/vcpkg/pull/8100) [libvpx] Fix build when VCPKG_BUILD_TYPE is set.
|
||||
|
||||
- grpc `1.22.0` -> `1.23.0`
|
||||
- [(#8109)](https://github.com/microsoft/vcpkg/pull/8109) [grpc] Update grpc to 1.23.0
|
||||
|
||||
- egl-registry `2018-06-30-1` -> `2019-08-08`
|
||||
- [(#8095)](https://github.com/microsoft/vcpkg/pull/8095) Update egl-registry to 2019-08-08 and opengl-registry to 2019-08-22.
|
||||
|
||||
- opengl-registry `2018-06-30-1` -> `2019-08-22`
|
||||
- [(#8095)](https://github.com/microsoft/vcpkg/pull/8095) Update egl-registry to 2019-08-08 and opengl-registry to 2019-08-22.
|
||||
|
||||
- dimcli `5.0.0` -> `5.0.1`
|
||||
- [(#8024)](https://github.com/microsoft/vcpkg/pull/8024) [dimcli] Upgrade to version 5.0.1
|
||||
|
||||
- libwebsockets `3.1.0-3` -> `3.2.0`
|
||||
- [(#8017)](https://github.com/microsoft/vcpkg/pull/8017) Update libwebsockets to v3.2.0
|
||||
|
||||
- mongo-c-driver `1.14.0-3-1` -> `1.14.0-4`
|
||||
- [(#7974)](https://github.com/microsoft/vcpkg/pull/7974) [mongo-c-driver] fix debug linkage under linux
|
||||
|
||||
- qwt `6.1.3-7` -> `6.1.3-8`
|
||||
- [(#8030)](https://github.com/microsoft/vcpkg/pull/8030) [qwt]make qwt support unix
|
||||
|
||||
- ixwebsocket `5.0.4` -> `6.1.0`
|
||||
- [(#7839)](https://github.com/microsoft/vcpkg/pull/7839) [ixwebsocket] update to 6.1.0 to fix Windows problem
|
||||
|
||||
- cpp-httplib `0.2.1` -> `0.2.4`
|
||||
- [(#8054)](https://github.com/microsoft/vcpkg/pull/8054) [cpp-httplib] Update library to 0.2.2
|
||||
- [(#8172)](https://github.com/microsoft/vcpkg/pull/8172) [cpp-httplib] Update library to 0.2.4
|
||||
|
||||
- blend2d `beta_2019-07-16` -> `beta_2019-10-09`
|
||||
- [(#8120)](https://github.com/microsoft/vcpkg/pull/8120) [blend2d] Port update beta_2019-10-09
|
||||
|
||||
- json-c `2019-05-31` -> `2019-09-10`
|
||||
- [(#8121)](https://github.com/microsoft/vcpkg/pull/8121) [json-c] Add dynamic library support
|
||||
|
||||
- glfw3 `3.3-1` -> `3.3-2`
|
||||
- [(#7592)](https://github.com/microsoft/vcpkg/pull/7592) [glfw3] fix cmake config
|
||||
|
||||
- google-cloud-cpp `0.12.0` -> `0.13.0`
|
||||
- [(#8077)](https://github.com/microsoft/vcpkg/pull/8077) Update google-cloud-cpp and googleapis.
|
||||
|
||||
- googleapis `0.1.3` -> `0.1.5`
|
||||
- [(#8077)](https://github.com/microsoft/vcpkg/pull/8077) Update google-cloud-cpp and googleapis.
|
||||
|
||||
- tbb `2019_U8` -> `2019_U8-1`
|
||||
- [(#8018)](https://github.com/microsoft/vcpkg/pull/8018) [tbb]Fix static build.
|
||||
|
||||
- openxr-loader `1.0.0-2` -> `2019-09-25`
|
||||
- [(#8123)](https://github.com/microsoft/vcpkg/pull/8123) [openxr-loader] Update to 1.0.2
|
||||
- [(#8255)](https://github.com/microsoft/vcpkg/pull/8255) [openxr-loader] Add openxr C++ bindings
|
||||
|
||||
- sdl1 `1.2.15-6` -> `1.2.15-8`
|
||||
- [(#8070)](https://github.com/microsoft/vcpkg/pull/8070) [sdl1]Support linux build.
|
||||
- [(#8327)](https://github.com/microsoft/vcpkg/pull/8327) [sdl1] fix windows sdk 18362 build failure
|
||||
|
||||
- glslang `2019-03-05` -> `2019-03-05-1`
|
||||
- [(#8051)](https://github.com/microsoft/vcpkg/pull/8051) [glslang]Fix generated cmake files.
|
||||
|
||||
- opencl `2.2 (2017.07.18)-1` -> `2.2 (2018.08.31)`
|
||||
- [(#4204)](https://github.com/microsoft/vcpkg/pull/4204) Linux support for the OpenCL SDK package
|
||||
|
||||
- libspatialite `4.3.0a-3` -> `4.3.0a-4`
|
||||
- [(#8025)](https://github.com/microsoft/vcpkg/pull/8025) [libspatialite]make libspatialite support linux and osx
|
||||
|
||||
- libqrencode `4.0.2` -> `4.0.2-1`
|
||||
- [(#8099)](https://github.com/microsoft/vcpkg/pull/8099) [libqrencode] Add tool feature; Remove unnecessary patch
|
||||
|
||||
- sdl2-mixer `2.0.4-3` -> `2.0.4-6`
|
||||
- [(#7720)](https://github.com/microsoft/vcpkg/pull/7720) [sdl2-mixer]Remove useless dependency link libraries.
|
||||
- [(#8208)](https://github.com/microsoft/vcpkg/pull/8208) [sdl2-mixer] Fix features dependency link.
|
||||
- [(#8335)](https://github.com/microsoft/vcpkg/pull/8335) [sdl2-mixer]Re-fix dynamic call.
|
||||
|
||||
- evpp `0.7.0` -> `0.7.0-1`
|
||||
- [(#8050)](https://github.com/microsoft/vcpkg/pull/8050) [evpp]Fix linux build.
|
||||
|
||||
- libogg `1.3.3-4` -> `1.3.4`
|
||||
- [(#8094)](https://github.com/microsoft/vcpkg/pull/8094) [libogg] Update to 1.3.4-1
|
||||
|
||||
- otl `4.0.442` -> `4.0.443`
|
||||
- [(#8139)](https://github.com/microsoft/vcpkg/pull/8139) [otl] fix hash and update version
|
||||
|
||||
- speexdsp `1.2rc3-3` -> `1.2.0`
|
||||
- [(#8140)](https://github.com/microsoft/vcpkg/pull/8140) [speexdsp] update to 1.2.0
|
||||
|
||||
- pcl `1.9.1-8` -> `1.9.1-9`
|
||||
- [(#8154)](https://github.com/microsoft/vcpkg/pull/8154) [pcl] Fix problem with link-type keywords in linked libraries
|
||||
|
||||
- libqglviewer `2.7.0` -> `2.7.0-2`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
|
||||
- qt5-3d `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-activeqt `5.12.3-1` -> `5.12.5`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
|
||||
- qt5-base `5.12.3-4` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
- [(#8212)](https://github.com/microsoft/vcpkg/pull/8212) [Qt] feature latest to build 5.13.1
|
||||
|
||||
- qt5-charts `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-connectivity `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-datavis3d `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-declarative `5.12.3-2` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-graphicaleffects `5.12.3-1` -> `5.12.5`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
|
||||
- qt5-imageformats `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-location `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-macextras `5.12.3-1` -> `5.12.5`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
|
||||
- qt5-modularscripts `2019-04-30-1` -> `deprecated`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
|
||||
- qt5-mqtt `5.12.3-1` -> `5.12.5`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
|
||||
- qt5-multimedia `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-networkauth `5.12.3-1` -> `5.12.5`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
|
||||
- qt5-purchasing `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-quickcontrols `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-quickcontrols2 `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-remoteobjects `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-script `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-scxml `5.12.3-1` -> `5.12.5`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
|
||||
- qt5-sensors `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-serialport `5.12.3-1` -> `5.12.5`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
|
||||
- qt5-speech `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-svg `5.12.3-1` -> `5.12.5`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
|
||||
- qt5-tools `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-virtualkeyboard `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-webchannel `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-websockets `5.12.3-1` -> `5.12.5`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-webview `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-winextras `5.12.3-1` -> `5.12.5-1`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5-xmlpatterns `5.12.3-1` -> `5.12.5`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8222)](https://github.com/microsoft/vcpkg/pull/8222) [Qt] Fix static builds of qt5-imageformats
|
||||
|
||||
- qt5 `5.12.3-1` -> `5.12.5`
|
||||
- [(#7667)](https://github.com/microsoft/vcpkg/pull/7667) [Qt] Update to 5.12.4
|
||||
- [(#8159)](https://github.com/microsoft/vcpkg/pull/8159) [Qt] update to 5.12.5
|
||||
- [(#8212)](https://github.com/microsoft/vcpkg/pull/8212) [Qt] feature latest to build 5.13.1
|
||||
|
||||
- mathgl `2.4.3-1` -> `2.4.3-2`
|
||||
- [(#8145)](https://github.com/microsoft/vcpkg/pull/8145) [mathgl]Fix build failure on x86-windows.
|
||||
|
||||
- libpng `1.6.37-3` -> `1.6.37-4`
|
||||
- [(#8079)](https://github.com/microsoft/vcpkg/pull/8079) [libpng] Replace find_library() with a simple set() for linking libm on UNIX
|
||||
|
||||
- chakracore `1.11.12` -> `1.11.13`
|
||||
- [(#8171)](https://github.com/microsoft/vcpkg/pull/8171) [chakracore] Update library to 1.11.13
|
||||
|
||||
- fastcdr `1.0.10` -> `1.0.11`
|
||||
- [(#8173)](https://github.com/microsoft/vcpkg/pull/8173) [fastcdr] Update library to 1.0.11
|
||||
|
||||
- yara `e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-2` -> `3.10.0`
|
||||
- [(#8194)](https://github.com/microsoft/vcpkg/pull/8194) [yara] Update to 3.10.0
|
||||
|
||||
- rabit `0.1` -> `0.1-2`
|
||||
- [(#8042)](https://github.com/microsoft/vcpkg/pull/8042) [rabit] Fix file conflict with dmlc
|
||||
- [(#8206)](https://github.com/microsoft/vcpkg/pull/8206) [rabit] Fix cmake files path
|
||||
|
||||
- gdcm `3.0.0-4` -> `3.0.0-5`
|
||||
- [(#7852)](https://github.com/microsoft/vcpkg/pull/7852) [gdcm] Fix file UseGDCM.cmake path name
|
||||
|
||||
- libyaml `0.2.2-1` -> `0.2.2-2`
|
||||
- [(#8177)](https://github.com/microsoft/vcpkg/pull/8177) Fix libyaml CMake package and CMake targets
|
||||
|
||||
- clapack `3.2.1-10` -> `3.2.1-12`
|
||||
- [(#8191)](https://github.com/microsoft/vcpkg/pull/8191) [clapack] Fix clapack-targets.cmake path in clpack-config.cmake
|
||||
- [(#8388)](https://github.com/microsoft/vcpkg/pull/8388) [clapack] fix clapack install
|
||||
|
||||
- embree3 `3.5.2-1` -> `3.5.2-2`
|
||||
- [(#8192)](https://github.com/microsoft/vcpkg/pull/8192) [embree3]Fix static build and cmake path.
|
||||
|
||||
- llvm `8.0.0` -> `8.0.0-2`
|
||||
- [(#7919)](https://github.com/microsoft/vcpkg/pull/7919) [llvm]Fix build error on Linux: cannot find -lxml2.
|
||||
- [(#8102)](https://github.com/microsoft/vcpkg/pull/8102) [halide]Upgrade to release_2019_08_27.
|
||||
|
||||
- vtk `8.2.0-5` -> `8.2.0-8`
|
||||
- [(#7933)](https://github.com/microsoft/vcpkg/pull/7933) [VTK] VTK links with release version of LMZA in debug build instead of debu…
|
||||
- [(#8345)](https://github.com/microsoft/vcpkg/pull/8345) [vtk] Fix vtk[python] build failure
|
||||
- [(#8403)](https://github.com/microsoft/vcpkg/pull/8403) [vtk] fix typo in lzma and lz4 patch
|
||||
|
||||
- dcmtk `3.6.4-1` -> `3.6.4-2`
|
||||
- [(#8202)](https://github.com/microsoft/vcpkg/pull/8202) [dcmtk] Fix build error on Linux
|
||||
|
||||
- openimageio `2019-08-08-2` -> `2019-08-08-4`
|
||||
- [(#8210)](https://github.com/microsoft/vcpkg/pull/8210) [openimageio] Add opencolorio as feature
|
||||
- [(#8230)](https://github.com/microsoft/vcpkg/pull/8230) [openimageio]Re-fix find openexr issue.
|
||||
- [(#8379)](https://github.com/microsoft/vcpkg/pull/8379) [alembic,geogram,openimageio]: openexr and libraw debug linkage, minor fix for geogram
|
||||
|
||||
- cli `1.1-1` -> `1.1.1`
|
||||
- [(#8209)](https://github.com/microsoft/vcpkg/pull/8209) [cli] Update the version to 1.1.1
|
||||
|
||||
- libepoxy `1.5.3` -> `1.5.3-1`
|
||||
- [(#7985)](https://github.com/microsoft/vcpkg/pull/7985) [libepoxy]Add support with unix.
|
||||
|
||||
- atk `2.24.0-3` -> `2.24.0-4`
|
||||
- [(#7991)](https://github.com/microsoft/vcpkg/pull/7991) [atk]Support UNIX.
|
||||
|
||||
- date `2019-05-18-1` -> `2019-09-09`
|
||||
- [(#8151)](https://github.com/microsoft/vcpkg/pull/8151) [date] Add official CMake targets support
|
||||
|
||||
- riffcpp `2.2.2` -> `2.2.4`
|
||||
- [(#8153)](https://github.com/microsoft/vcpkg/pull/8153) [riffcpp] Update to 2.2.4
|
||||
|
||||
- duktape `2.4.0-3` -> `2.4.0-4`
|
||||
- [(#8144)](https://github.com/microsoft/vcpkg/pull/8144) [duktape] Change download path of pip.
|
||||
|
||||
- cgicc `3.2.19-2` -> `3.2.19-3`
|
||||
- [(#8232)](https://github.com/microsoft/vcpkg/pull/8232) [cgicc]Fix linux build.
|
||||
|
||||
- graphicsmagick `1.3.32-1` -> `1.3.33`
|
||||
- [(#8256)](https://github.com/microsoft/vcpkg/pull/8256) [graphicsmagick] updated to 1.3.33
|
||||
|
||||
- ecsutil `1.0.7.2` -> `1.0.7.3`
|
||||
- [(#8253)](https://github.com/microsoft/vcpkg/pull/8253) update for ECSUtil 1.0.7.3
|
||||
|
||||
- cpp-redis `4.3.1-1` -> `4.3.1-2`
|
||||
- [(#8245)](https://github.com/microsoft/vcpkg/pull/8245) [simpleini cpp-redis tacopie] ports update
|
||||
|
||||
- simpleini `2018-08-31-1` -> `2018-08-31-2`
|
||||
- [(#8245)](https://github.com/microsoft/vcpkg/pull/8245) [simpleini cpp-redis tacopie] ports update
|
||||
|
||||
- tacopie `3.2.0-1` -> `3.2.0-2`
|
||||
- [(#8245)](https://github.com/microsoft/vcpkg/pull/8245) [simpleini cpp-redis tacopie] ports update
|
||||
|
||||
- cairo `1.16.0-1` -> `1.16.0-2`
|
||||
- [(#8249)](https://github.com/microsoft/vcpkg/pull/8249) [cairo]Add feature X11.
|
||||
|
||||
- tinynpy `1.0.0-2` -> `1.0.0-3`
|
||||
- [(#8274)](https://github.com/microsoft/vcpkg/pull/8274) [tinynpy] update
|
||||
|
||||
- io2d `2019-07-11` -> `2019-07-11-1`
|
||||
- [(#8251)](https://github.com/microsoft/vcpkg/pull/8251) [io2d]Fix linux build: add dependency cairo[x11].
|
||||
|
||||
- linenoise-ng `4754bee2d8eb3` -> `4754bee2d8eb3-1`
|
||||
- [(#8276)](https://github.com/microsoft/vcpkg/pull/8276) [linenoise-ng] Fix flaky config
|
||||
|
||||
- zeromq `2019-07-09-1` -> `2019-09-20`
|
||||
- [(#8119)](https://github.com/microsoft/vcpkg/pull/8119) [zeromq] Update to 2019-09-13
|
||||
|
||||
- basisu `1.11-1` -> `1.11-2`
|
||||
- [(#8289)](https://github.com/microsoft/vcpkg/pull/8289) [basisu] Updating with latest upstream changes
|
||||
|
||||
- doctest `2.3.4` -> `2.3.5`
|
||||
- [(#8295)](https://github.com/microsoft/vcpkg/pull/8295) [doctest] Update library to 2.3.5
|
||||
|
||||
- mbedtls `2.16.2` -> `2.16.3`
|
||||
- [(#8296)](https://github.com/microsoft/vcpkg/pull/8296) [mbedtls] Update library to 2.16.3
|
||||
|
||||
- pugixml `1.9-3` -> `1.10`
|
||||
- [(#8297)](https://github.com/microsoft/vcpkg/pull/8297) [pugixml] Update library to 1.10
|
||||
|
||||
- armadillo `2019-04-16-4` -> `2019-04-16-5`
|
||||
- [(#8299)](https://github.com/microsoft/vcpkg/pull/8299) [armadillo] Fix configure_file failed
|
||||
|
||||
- parallel-hashmap `1.23` -> `1.24`
|
||||
- [(#8301)](https://github.com/microsoft/vcpkg/pull/8301) [parallel-hashmap] Update library to 1.24
|
||||
|
||||
- realsense2 `2.22.0-1` -> `2.22.0-2`
|
||||
- [(#8303)](https://github.com/microsoft/vcpkg/pull/8303) [realsense2] fix dependency glfw3 and mismatching number of debug and release binaries
|
||||
|
||||
- ffmpeg `4.1-11` -> `4.2`
|
||||
- [(#8021)](https://github.com/microsoft/vcpkg/pull/8021) [ffmpeg] update to 4.2
|
||||
|
||||
- open62541 `0.3.0-3` -> `0.3.0-4`
|
||||
- [(#8252)](https://github.com/microsoft/vcpkg/pull/8252) [open62541] fix dynamic build
|
||||
|
||||
- librdkafka `1.1.0-1` -> `1.2.0-2`
|
||||
- [(#8307)](https://github.com/microsoft/vcpkg/pull/8307) [librdkafka] Update library to 1.2.0
|
||||
- [(#8355)](https://github.com/microsoft/vcpkg/pull/8355) [librdkafka] Add vcpkg-cmake-wrapper.cmake
|
||||
|
||||
- chartdir `6.3.1` -> `6.3.1-1`
|
||||
- [(#8308)](https://github.com/microsoft/vcpkg/pull/8308) [chartdir] fix hash for osx
|
||||
|
||||
- mpfr `4.0.1` -> `4.0.2-1`
|
||||
- [(#8324)](https://github.com/microsoft/vcpkg/pull/8324) update mpfr to 4.0.2 and fix build on osx
|
||||
|
||||
- cuda `9.0` -> `10.1`
|
||||
- [(#7536)](https://github.com/microsoft/vcpkg/pull/7536) [cudnn] add port and enable it in darknet
|
||||
|
||||
- darknet `0.2.5-6` -> `0.2.5.1`
|
||||
- [(#7536)](https://github.com/microsoft/vcpkg/pull/7536) [cudnn] add port and enable it in darknet
|
||||
|
||||
- opencv4 `4.1.1-1` -> `4.1.1-2`
|
||||
- [(#7536)](https://github.com/microsoft/vcpkg/pull/7536) [cudnn] add port and enable it in darknet
|
||||
|
||||
- libiconv `1.15-5` -> `1.15-6`
|
||||
- [(#8312)](https://github.com/microsoft/vcpkg/pull/8312) [libiconv] Guard imported targets in non-Windows
|
||||
|
||||
- gsoap `2.8.87-1` -> `2.8.93-1`
|
||||
- [(#8338)](https://github.com/microsoft/vcpkg/pull/8338) [gSoap] Update to 2.8.93
|
||||
|
||||
- arrow `0.14.1` -> `0.14.1-1`
|
||||
- [(#8263)](https://github.com/microsoft/vcpkg/pull/8263) [arrow]Fix build error on Visual Studio 2019.
|
||||
|
||||
- sol2 `3.0.3` -> `3.0.3-1`
|
||||
- [(#8243)](https://github.com/microsoft/vcpkg/pull/8243) [sol2]Fix using namespace.
|
||||
|
||||
- alembic `1.7.11-4` -> `1.7.11-5`
|
||||
- [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path
|
||||
- [(#8379)](https://github.com/microsoft/vcpkg/pull/8379) [alembic,geogram,openimageio]: openexr and libraw debug linkage, minor fix for geogram
|
||||
|
||||
- avro-c `1.8.2-2` -> `1.8.2-3`
|
||||
- [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path
|
||||
|
||||
- aws-sdk-cpp `1.7.142` -> `1.7.142-1`
|
||||
- [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path
|
||||
|
||||
- boost-system `1.70.0` -> `1.70.0-1`
|
||||
- [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path
|
||||
|
||||
- cgal `4.14-2` -> `4.14-3`
|
||||
- [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path
|
||||
|
||||
- eigen3 `3.3.7-2` -> `3.3.7-3`
|
||||
- [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path
|
||||
|
||||
- itk `5.0.1` -> `5.0.1-1`
|
||||
- [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path
|
||||
|
||||
- kinectsdk2 `2.0-1` -> `2.0-2`
|
||||
- [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path
|
||||
|
||||
- ompl `1.4.2-1` -> `1.4.2-2`
|
||||
- [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path
|
||||
|
||||
- openmvg `1.4-5` -> `1.4-6`
|
||||
- [(#8331)](https://github.com/microsoft/vcpkg/pull/8331) [many ports] Warning to VCPKG long build path
|
||||
|
||||
- curl `7.65.2-1` -> `7.66.0`
|
||||
- [(#7331)](https://github.com/microsoft/vcpkg/pull/7331) [curl] Update to 7.66.0
|
||||
|
||||
- halide `release_2018_02_15-1` -> `release_2019_08_27`
|
||||
- [(#8102)](https://github.com/microsoft/vcpkg/pull/8102) [halide]Upgrade to release_2019_08_27.
|
||||
|
||||
- boost-accumulators `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-algorithm `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-align `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-any `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-array `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-asio `1.70.0-2` -> `1.71.0-1`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-assert `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-assign `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-atomic `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-beast `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-bimap `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-bind `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-callable-traits `2.3.2` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-chrono `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-circular-buffer `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-compatibility `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-compute `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-concept-check `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-config `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-container-hash `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-container `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-context `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-contract `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-conversion `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-convert `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-core `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-coroutine `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-coroutine2 `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-crc `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-date-time `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-detail `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-disjoint-sets `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-dll `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-dynamic-bitset `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-endian `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-exception `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-fiber `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-filesystem `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-flyweight `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-foreach `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-format `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-function-types `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-function `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-functional `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-fusion `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-geometry `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-gil `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-graph-parallel `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-graph `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- boost-hana `1.70.0` -> `1.71.0`
|
||||
- [(#7959)](https://github.com/microsoft/vcpkg/pull/7959) [boost] Update to 1.71.0
|
||||
|
||||
- hpx `1.3.0-1` -> `1.3.0-2`
|
||||
- [(#8259)](https://github.com/microsoft/vcpkg/pull/8259) [hpx] Redirect --head to `stable`
|
||||
|
||||
- assimp `4.1.0-8` -> `5.0.0`
|
||||
- [(#8370)](https://github.com/microsoft/vcpkg/pull/8370) [assimp] Update the version to 5.0.0
|
||||
- [(#8381)](https://github.com/microsoft/vcpkg/pull/8381) [assimp] Update the version
|
||||
|
||||
- angle `2019-06-13` -> `2019-07-19-2`
|
||||
- [(#7329)](https://github.com/microsoft/vcpkg/pull/7329) [angle] Update to the latest commit.
|
||||
- [(#8395)](https://github.com/microsoft/vcpkg/pull/8395) drop useless patch
|
||||
|
||||
</details>
|
||||
|
||||
-- vcpkg team vcpkg@microsoft.com TUE, 01 Oct 22:00:00 -0800
|
||||
|
||||
vcpkg (2019.08.31)
|
||||
---
|
||||
#### Total port count: 1169
|
||||
|
72
README_zh_CN.md
Normal file
72
README_zh_CN.md
Normal file
@ -0,0 +1,72 @@
|
||||
# Vcpkg
|
||||
|
||||
## 概要
|
||||
Vcpkg 可帮助您在 Windows、Linux 和 MacOS 上管理 C 和 C++ 库。这个工具和生态系统正在不断发展,您的参与对它的成功至关重要!
|
||||
|
||||
如需获取有关可用命令的简短描述, 请执行 `vcpkg help`。
|
||||
|
||||
## 快速开始
|
||||
需求:
|
||||
- Windows 10、8.1、7、Linux、或 MacOS
|
||||
- Visual Studio 2015 Update 3 或更新的版本 (Windows 中)
|
||||
- Git
|
||||
- *可选:* CMake 3.12.4
|
||||
|
||||
如何开始:
|
||||
```
|
||||
> git clone https://github.com/Microsoft/vcpkg.git
|
||||
> cd vcpkg
|
||||
|
||||
PS> .\bootstrap-vcpkg.bat
|
||||
Linux:~/$ ./bootstrap-vcpkg.sh
|
||||
```
|
||||
|
||||
然后,[集成](docs/users/integration.md)至本机环境中,执行 (注意: 首次启动需要管理员权限)
|
||||
```
|
||||
PS> .\vcpkg integrate install
|
||||
Linux:~/$ ./vcpkg integrate install
|
||||
```
|
||||
|
||||
使用以下命令安装任意包
|
||||
```
|
||||
PS> .\vcpkg install sdl2 curl
|
||||
Linux:~/$ ./vcpkg install sdl2 curl
|
||||
```
|
||||
|
||||
与CMake一起使用已安装库的最佳方法是通过工具链文件 `scripts\buildsystems\vcpkg.cmake`。要使用此文件,您只需将 `-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]\scripts\buildsystems\vcpkg.cmake` 作为参数添加到CMake命令行中。
|
||||
|
||||
在Visual Studio中,您可以创建一个新项目(或打开一个已有项目)。所有已安装的库都可以使用 `#include` 在您的项目中使用,而无需进行其他配置。
|
||||
|
||||
若需获取更多信息,请查看[使用一个包](docs/examples/installing-and-using-packages.md)具体示例。 若您需要使用的库不在vcpkg中,请[在GitHub上创建一个issue](https://github.com/microsoft/vcpkg/issues) ,开发团队和贡献者会看到它,并有可能为此库创建端口文件。
|
||||
|
||||
有关 macOS 和 Linux 支持的其他说明,请参见[官方公告](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/)。
|
||||
|
||||
## Tab补全/自动补全
|
||||
`vcpkg`支持在 Powershell 和 bash 中自动补全命令、程序包名称、选项等。如需启用自动补全功能,请使用以下命令:
|
||||
```
|
||||
PS> .\vcpkg integrate powershell
|
||||
Linux:~/$ ./vcpkg integrate bash
|
||||
```
|
||||
并重启您的控制台。
|
||||
|
||||
|
||||
## 示例
|
||||
请查看[文档](docs/index.md)获取具体示例,其包含[安装并使用包](docs/examples/installing-and-using-packages.md),[使用压缩文件添加包](docs/examples/packaging-zipfiles.md),和[从GitHub源中添加一个包](docs/examples/packaging-github-repos.md)。
|
||||
|
||||
我们的文档现在也可以从[ReadTheDocs](https://vcpkg.readthedocs.io/)在线获取。
|
||||
|
||||
观看4分钟[demo视频](https://www.youtube.com/watch?v=y41WFKbQFTw)。
|
||||
|
||||
## 贡献者
|
||||
Vcpkg通过您的贡献不断发展。下面是一些您可以贡献的方式:
|
||||
|
||||
* 创建一个关于vcpkg或已支持包的[新issue](https://github.com/Microsoft/vcpkg/issues)
|
||||
* [创建修复PR和创建新包](https://github.com/Microsoft/vcpkg/pulls)
|
||||
|
||||
请参阅我们的[贡献准则](CONTRIBUTING.md)了解更多详细信息。
|
||||
|
||||
该项目采用了[Microsoft开源行为准则](https://opensource.microsoft.com/codeofconduct/)。获取更多信息请查看 [行为准则FAQ](https://opensource.microsoft.com/codeofconduct/faq/)或联系[opencode@microsoft.com](mailto:opencode@microsoft.com)提出其他问题或意见。
|
||||
|
||||
## License
|
||||
|
||||
使用的代码 License 为[MIT License](LICENSE.txt)。
|
@ -156,7 +156,7 @@ It is preferable to set options in a call to `vcpkg_configure_xyz()` over patchi
|
||||
Common options that allow avoiding patching:
|
||||
1. [MSBUILD] `<PropertyGroup>` settings inside the project file can be overridden via `/p:` parameters
|
||||
2. [CMAKE] Calls to `find_package(XYz)` in CMake scripts can be disabled via [`-DCMAKE_DISABLE_FIND_PACKAGE_XYz=ON`](https://cmake.org/cmake/help/v3.15/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html)
|
||||
3. [CMAKE] Cache variables (declared as `set(VAR "value" CACHE STRING "Documentation")` or `option(VAR "Documentation" "Default Value")`) can be overriden by just passing them in on the command line as `-DVAR:STRING=Foo`. One notable exception is if the `FORCE` parameter is passed to `set()`. See also the [CMake `set` documentation](https://cmake.org/cmake/help/v3.15/command/set.html)
|
||||
3. [CMAKE] Cache variables (declared as `set(VAR "value" CACHE STRING "Documentation")` or `option(VAR "Documentation" "Default Value")`) can be overridden by just passing them in on the command line as `-DVAR:STRING=Foo`. One notable exception is if the `FORCE` parameter is passed to `set()`. See also the [CMake `set` documentation](https://cmake.org/cmake/help/v3.15/command/set.html)
|
||||
|
||||
### Prefer patching over overriding `VCPKG_<VARIABLE>` values
|
||||
|
||||
|
@ -6,12 +6,15 @@
|
||||
- [vcpkg\_add\_to\_path](vcpkg_add_to_path.md)
|
||||
- [vcpkg\_apply\_patches](vcpkg_apply_patches.md)
|
||||
- [vcpkg\_build\_cmake](vcpkg_build_cmake.md)
|
||||
- [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md)
|
||||
- [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md)
|
||||
- [vcpkg\_build\_make](vcpkg_build_make.md)
|
||||
- [vcpkg\_build\_nmake](vcpkg_build_nmake.md)
|
||||
- [vcpkg\_check\_features](vcpkg_check_features.md)
|
||||
- [vcpkg\_check\_linkage](vcpkg_check_linkage.md)
|
||||
- [vcpkg\_clean\_msbuild](vcpkg_clean_msbuild.md)
|
||||
- [vcpkg\_common\_definitions](vcpkg_common_definitions.md)
|
||||
- [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md)
|
||||
- [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md)
|
||||
- [vcpkg\_configure\_make](vcpkg_configure_make.md)
|
||||
- [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md)
|
||||
- [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md)
|
||||
- [vcpkg\_download\_distfile](vcpkg_download_distfile.md)
|
||||
@ -26,6 +29,8 @@
|
||||
- [vcpkg\_from\_github](vcpkg_from_github.md)
|
||||
- [vcpkg\_from\_gitlab](vcpkg_from_gitlab.md)
|
||||
- [vcpkg\_install\_cmake](vcpkg_install_cmake.md)
|
||||
- [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md)
|
||||
- [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md)
|
||||
- [vcpkg\_install\_make](vcpkg_install_make.md)
|
||||
- [vcpkg\_install\_nmake](vcpkg_install_nmake.md)
|
||||
- [vcpkg\_prettify\_command](vcpkg_prettify_command.md)
|
||||
- [vcpkg\_test\_cmake](vcpkg_test_cmake.md)
|
||||
|
30
docs/maintainers/vcpkg_build_make.md
Normal file
30
docs/maintainers/vcpkg_build_make.md
Normal file
@ -0,0 +1,30 @@
|
||||
# vcpkg_build_make
|
||||
|
||||
Build a linux makefile project.
|
||||
|
||||
## Usage:
|
||||
```cmake
|
||||
vcpkg_build_make([TARGET <target>])
|
||||
```
|
||||
|
||||
### TARGET
|
||||
The target passed to the configure/make build command (`./configure/make/make install`). If not specified, no target will
|
||||
be passed.
|
||||
|
||||
### ADD_BIN_TO_PATH
|
||||
Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs.
|
||||
|
||||
## Notes:
|
||||
This command should be preceeded by a call to [`vcpkg_configure_make()`](vcpkg_configure_make.md).
|
||||
You can use the alias [`vcpkg_install_make()`](vcpkg_configure_make.md) function if your CMake script supports the
|
||||
"install" target
|
||||
|
||||
## Examples
|
||||
|
||||
* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake)
|
||||
* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake)
|
||||
* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake)
|
||||
* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake)
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_build_make.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_make.cmake)
|
63
docs/maintainers/vcpkg_build_nmake.md
Normal file
63
docs/maintainers/vcpkg_build_nmake.md
Normal file
@ -0,0 +1,63 @@
|
||||
# vcpkg_build_nmake
|
||||
|
||||
Build a msvc makefile project.
|
||||
|
||||
## Usage:
|
||||
```cmake
|
||||
vcpkg_build_nmake(
|
||||
SOURCE_PATH <${SOURCE_PATH}>
|
||||
[NO_DEBUG]
|
||||
PROJECT_SUBPATH <${SUBPATH}>
|
||||
PROJECT_NAME <${MAKEFILE_NAME}>
|
||||
[OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...]
|
||||
[OPTIONS_RELEASE <-DOPTIMIZE=1>...]
|
||||
[OPTIONS_DEBUG <-DDEBUGGABLE=1>...]
|
||||
[TARGET <target>])
|
||||
```
|
||||
|
||||
## Parameters
|
||||
### SOURCE_PATH
|
||||
Specifies the directory containing the source files.
|
||||
By convention, this is usually set in the portfile as the variable `SOURCE_PATH`.
|
||||
|
||||
### PROJECT_SUBPATH
|
||||
Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefile.msvc` or other msvc makefile.
|
||||
|
||||
### PROJECT_NAME
|
||||
Specifies the name of msvc makefile name.
|
||||
Default is `makefile.vc`
|
||||
|
||||
### NO_DEBUG
|
||||
This port doesn't support debug mode.
|
||||
|
||||
### ENABLE_INSTALL
|
||||
Install binaries after build.
|
||||
|
||||
### OPTIONS
|
||||
Additional options passed to generate during the generation.
|
||||
|
||||
### OPTIONS_RELEASE
|
||||
Additional options passed to generate during the Release generation. These are in addition to `OPTIONS`.
|
||||
|
||||
### OPTIONS_DEBUG
|
||||
Additional options passed to generate during the Debug generation. These are in addition to `OPTIONS`.
|
||||
|
||||
### TARGET
|
||||
The target passed to the nmake build command (`nmake/nmake install`). If not specified, no target will
|
||||
be passed.
|
||||
|
||||
### ADD_BIN_TO_PATH
|
||||
Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs.
|
||||
|
||||
## Notes:
|
||||
This command should be preceeded by a call to [`vcpkg_configure_nmake()`](vcpkg_configure_nmake.md).
|
||||
You can use the alias [`vcpkg_install_nmake()`](vcpkg_configure_nmake.md) function if your CMake script supports the
|
||||
"install" target
|
||||
|
||||
## Examples
|
||||
|
||||
* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake)
|
||||
* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake)
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_build_nmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_nmake.cmake)
|
74
docs/maintainers/vcpkg_configure_make.md
Normal file
74
docs/maintainers/vcpkg_configure_make.md
Normal file
@ -0,0 +1,74 @@
|
||||
# vcpkg_configure_make
|
||||
|
||||
Configure `configure` for Debug and Release builds of a project.
|
||||
|
||||
## Usage
|
||||
```cmake
|
||||
vcpkg_configure_make(
|
||||
SOURCE_PATH <${SOURCE_PATH}>
|
||||
[AUTOCONFIG]
|
||||
[DISABLE_AUTO_HOST]
|
||||
[DISABLE_AUTO_DST]
|
||||
[GENERATOR]
|
||||
[NO_DEBUG]
|
||||
[PROJECT_SUBPATH <${PROJ_SUBPATH}>]
|
||||
[PRERUN_SHELL <${SHELL_PATH}>]
|
||||
[OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...]
|
||||
[OPTIONS_RELEASE <-DOPTIMIZE=1>...]
|
||||
[OPTIONS_DEBUG <-DDEBUGGABLE=1>...]
|
||||
)
|
||||
```
|
||||
|
||||
## Parameters
|
||||
### SOURCE_PATH
|
||||
Specifies the directory containing the `configure`/`configure.ac`.
|
||||
By convention, this is usually set in the portfile as the variable `SOURCE_PATH`.
|
||||
|
||||
### PROJECT_SUBPATH
|
||||
Specifies the directory containing the ``configure`/`configure.ac`.
|
||||
By convention, this is usually set in the portfile as the variable `SOURCE_PATH`.
|
||||
Should use `GENERATOR NMake` first.
|
||||
|
||||
### NO_DEBUG
|
||||
This port doesn't support debug mode.
|
||||
|
||||
### AUTOCONFIG
|
||||
Need to use autoconfig to generate configure file.
|
||||
|
||||
### DISABLE_AUTO_HOST
|
||||
Don't set host automatically, the default value is `i686`.
|
||||
If use this option, you will need to set host manually.
|
||||
|
||||
### DISABLE_AUTO_DST
|
||||
Don't set installation path automatically, the default value is `${CURRENT_PACKAGES_DIR}` and `${CURRENT_PACKAGES_DIR}/debug`
|
||||
If use this option, you will need to set dst path manually.
|
||||
|
||||
### GENERATOR
|
||||
Specifies the precise generator to use.
|
||||
NMake: nmake(windows) make(unix)
|
||||
MAKE: make(windows) make(unix)
|
||||
|
||||
### PRERUN_SHELL
|
||||
Script that needs to be called before configuration
|
||||
|
||||
### OPTIONS
|
||||
Additional options passed to configure during the configuration.
|
||||
|
||||
### OPTIONS_RELEASE
|
||||
Additional options passed to configure during the Release configuration. These are in addition to `OPTIONS`.
|
||||
|
||||
### OPTIONS_DEBUG
|
||||
Additional options passed to configure during the Debug configuration. These are in addition to `OPTIONS`.
|
||||
|
||||
## Notes
|
||||
This command supplies many common arguments to configure. To see the full list, examine the source.
|
||||
|
||||
## Examples
|
||||
|
||||
* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake)
|
||||
* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake)
|
||||
* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake)
|
||||
* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake)
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_configure_make.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake)
|
30
docs/maintainers/vcpkg_fixup_cmake_targets.md
Normal file
30
docs/maintainers/vcpkg_fixup_cmake_targets.md
Normal file
@ -0,0 +1,30 @@
|
||||
# vcpkg_fixup_cmake_targets
|
||||
|
||||
Transforms all `/debug/share/\<port\>/\*targets-debug.cmake` files and move them to `/share/\<port\>`.
|
||||
Removes all `/debug/share/\<port\>/\*targets.cmake and /debug/share/\<port\>/\*config.cmake`.
|
||||
|
||||
Transforms all references matching `/bin/\*.exe tools/\<port\>/\*.exe` on Windows.
|
||||
Transforms all references matching `/bin/\* to /tools/\<port\>/\*` on other platforms.
|
||||
|
||||
Fixups *${_IMPORT_PREFIX}* in auto generated targets to be one folder deeper.
|
||||
Replaces *${CURRENT_INSTALLED_DIR}* with *${_IMPORT_PREFIX}* in config files and targets.
|
||||
|
||||
|
||||
## Usage
|
||||
```cmake
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH <config_path>)
|
||||
```
|
||||
|
||||
## Parameters:
|
||||
### CONFIG_PATH
|
||||
*.cmake files subdirectory (e.g. "lib/cmake/${PORT}" or "cmake/${PORT}).
|
||||
### TARGET_PATH
|
||||
Optional location to place fixup'd files. Unecessary if target is "share/${PORT}".
|
||||
|
||||
## Examples:
|
||||
- [Azure-uamqp-c](https://github.com/microsoft/vcpkg/blob/master/ports/azure-uamqp-c/portfile.cmake)
|
||||
- [Brigand](https://github.com/microsoft/vcpkg/blob/master/ports/brigand/portfile.cmake)
|
||||
- [cctz](https://github.com/microsoft/vcpkg/blob/master/ports/cctz/portfile.cmake)
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_fixup_cmake_targets.cmake](https://github.com/microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_fixup_cmake_targets.cmake)
|
24
docs/maintainers/vcpkg_install_make.md
Normal file
24
docs/maintainers/vcpkg_install_make.md
Normal file
@ -0,0 +1,24 @@
|
||||
# vcpkg_install_make
|
||||
|
||||
Build and install a make project.
|
||||
|
||||
## Usage:
|
||||
```cmake
|
||||
vcpkg_install_make(...)
|
||||
```
|
||||
|
||||
## Parameters:
|
||||
See [`vcpkg_build_make()`](vcpkg_build_make.md).
|
||||
|
||||
## Notes:
|
||||
This command transparently forwards to [`vcpkg_build_make()`](vcpkg_build_make.md), adding `ENABLE_INSTALL`
|
||||
|
||||
## Examples
|
||||
|
||||
* [x264](https://github.com/Microsoft/vcpkg/blob/master/ports/x264/portfile.cmake)
|
||||
* [tcl](https://github.com/Microsoft/vcpkg/blob/master/ports/tcl/portfile.cmake)
|
||||
* [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake)
|
||||
* [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake)
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_install_make.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_make.cmake)
|
48
docs/maintainers/vcpkg_install_nmake.md
Normal file
48
docs/maintainers/vcpkg_install_nmake.md
Normal file
@ -0,0 +1,48 @@
|
||||
# vcpkg_install_nmake
|
||||
|
||||
Build and install a msvc makefile project.
|
||||
|
||||
## Usage:
|
||||
```cmake
|
||||
vcpkg_install_nmake(
|
||||
SOURCE_PATH <${SOURCE_PATH}>
|
||||
[NO_DEBUG]
|
||||
PROJECT_SUBPATH <${SUBPATH}>
|
||||
PROJECT_NAME <${MAKEFILE_NAME}>
|
||||
[OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...]
|
||||
[OPTIONS_RELEASE <-DOPTIMIZE=1>...]
|
||||
[OPTIONS_DEBUG <-DDEBUGGABLE=1>...]
|
||||
```
|
||||
|
||||
## Parameters
|
||||
### SOURCE_PATH
|
||||
Specifies the directory containing the source files.
|
||||
By convention, this is usually set in the portfile as the variable `SOURCE_PATH`.
|
||||
|
||||
### PROJECT_SUBPATH
|
||||
Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefile.msvc` or other msvc makefile.
|
||||
|
||||
### PROJECT_NAME
|
||||
Specifies the name of msvc makefile name.
|
||||
Default is makefile.vc
|
||||
|
||||
### NO_DEBUG
|
||||
This port doesn't support debug mode.
|
||||
|
||||
### OPTIONS
|
||||
Additional options passed to generate during the generation.
|
||||
|
||||
### OPTIONS_RELEASE
|
||||
Additional options passed to generate during the Release generation. These are in addition to `OPTIONS`.
|
||||
|
||||
### OPTIONS_DEBUG
|
||||
Additional options passed to generate during the Debug generation. These are in addition to `OPTIONS`.
|
||||
|
||||
## Parameters:
|
||||
See [`vcpkg_build_nmake()`](vcpkg_build_nmake.md).
|
||||
|
||||
## Notes:
|
||||
This command transparently forwards to [`vcpkg_build_nmake()`](vcpkg_build_nmake.md), adding `ENABLE_INSTALL`
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_install_nmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_nmake.cmake)
|
@ -1,3 +1,21 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
# Don't change to vcpkg_from_github! This points to a release and not an archive
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_6/ACE-src-6.5.6.zip"
|
||||
FILENAME ACE-src-6.5.6.zip
|
||||
SHA512 4ee42aafc86af159ab20dbb14c7c2a49bed733645f5cc3afa8cef3e9688ff929002f3420eb33e859afe10a534afc276340faa21d029fa56bd07bd9aed3403ab4
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
)
|
||||
|
||||
set(ACE_ROOT ${SOURCE_PATH})
|
||||
set(ENV{ACE_ROOT} ${ACE_ROOT})
|
||||
set(ACE_SOURCE_PATH ${ACE_ROOT}/ace)
|
||||
|
||||
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
||||
message(FATAL_ERROR "${PORT} does not currently support UWP")
|
||||
endif()
|
||||
@ -23,16 +41,6 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
endif()
|
||||
set(MPC_STATIC_FLAG -static)
|
||||
endif()
|
||||
include(vcpkg_common_functions)
|
||||
set(ACE_ROOT ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers)
|
||||
set(ENV{ACE_ROOT} ${ACE_ROOT})
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_6/ACE-src-6.5.6.zip"
|
||||
FILENAME ACE-src-6.5.6.zip
|
||||
SHA512 4ee42aafc86af159ab20dbb14c7c2a49bed733645f5cc3afa8cef3e9688ff929002f3420eb33e859afe10a534afc276340faa21d029fa56bd07bd9aed3403ab4
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
vcpkg_find_acquire_program(PERL)
|
||||
get_filename_component(PERL_PATH ${PERL} DIRECTORY)
|
||||
@ -58,7 +66,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME)
|
||||
else()
|
||||
set(SOLUTION_TYPE vc14)
|
||||
endif()
|
||||
file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
|
||||
file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"")
|
||||
endif()
|
||||
|
||||
if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
@ -67,8 +75,8 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
set(LIB_DEBUG_SUFFIX .a)
|
||||
set(LIB_PREFIX lib)
|
||||
set(SOLUTION_TYPE gnuace)
|
||||
file(WRITE ${SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"")
|
||||
file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)include/makeinclude/platform_linux.GNU")
|
||||
file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-linux.h\"")
|
||||
file(WRITE ${ACE_ROOT}/include/makeinclude/platform_macros.GNU "include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU")
|
||||
endif()
|
||||
|
||||
# Invoke mwc.pl to generate the necessary solution and project files
|
||||
@ -80,7 +88,7 @@ vcpkg_execute_required_process(
|
||||
|
||||
if(NOT VCPKG_CMAKE_SYSTEM_NAME)
|
||||
vcpkg_build_msbuild(
|
||||
PROJECT_PATH ${SOURCE_PATH}/ace.sln
|
||||
PROJECT_PATH ${ACE_SOURCE_PATH}/ace.sln
|
||||
PLATFORM ${MSBUILD_PLATFORM}
|
||||
USE_VCPKG_INTEGRATION
|
||||
)
|
||||
@ -101,34 +109,34 @@ endif()
|
||||
# ACE itself does not define an install target, so it is not clear which
|
||||
# headers are public and which not. For the moment we install everything
|
||||
# that is in the source path and ends in .h, .inl
|
||||
function(install_ace_headers_subdirectory SOURCE_PATH RELATIVE_PATH)
|
||||
file(GLOB HEADER_FILES ${SOURCE_PATH}/${RELATIVE_PATH}/*.h ${SOURCE_PATH}/${RELATIVE_PATH}/*.inl)
|
||||
function(install_ace_headers_subdirectory ORIGINAL_PATH RELATIVE_PATH)
|
||||
file(GLOB HEADER_FILES ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.h ${ORIGINAL_PATH}/${RELATIVE_PATH}/*.inl)
|
||||
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/${RELATIVE_PATH})
|
||||
endfunction()
|
||||
|
||||
# We manually install header found in the ace directory because in that case
|
||||
# we are supposed to install also *cpp files, see ACE_wrappers\debian\libace-dev.install file
|
||||
file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h ${SOURCE_PATH}/*.inl ${SOURCE_PATH}/*.cpp)
|
||||
file(GLOB HEADER_FILES ${ACE_SOURCE_PATH}/*.h ${ACE_SOURCE_PATH}/*.inl ${ACE_SOURCE_PATH}/*.cpp)
|
||||
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/ace/)
|
||||
|
||||
# Install headers in subdirectory
|
||||
install_ace_headers_subdirectory(${SOURCE_PATH} "Compression")
|
||||
install_ace_headers_subdirectory(${SOURCE_PATH} "Compression/rle")
|
||||
install_ace_headers_subdirectory(${SOURCE_PATH} "ETCL")
|
||||
install_ace_headers_subdirectory(${SOURCE_PATH} "QoS")
|
||||
install_ace_headers_subdirectory(${SOURCE_PATH} "Monitor_Control")
|
||||
install_ace_headers_subdirectory(${SOURCE_PATH} "os_include")
|
||||
install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/arpa")
|
||||
install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/net")
|
||||
install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/netinet")
|
||||
install_ace_headers_subdirectory(${SOURCE_PATH} "os_include/sys")
|
||||
install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression")
|
||||
install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Compression/rle")
|
||||
install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "ETCL")
|
||||
install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "QoS")
|
||||
install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "Monitor_Control")
|
||||
install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include")
|
||||
install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/arpa")
|
||||
install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/net")
|
||||
install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/netinet")
|
||||
install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "os_include/sys")
|
||||
if("ssl" IN_LIST FEATURES)
|
||||
install_ace_headers_subdirectory(${SOURCE_PATH} "SSL")
|
||||
install_ace_headers_subdirectory(${ACE_SOURCE_PATH} "SSL")
|
||||
endif()
|
||||
|
||||
# Install the libraries
|
||||
function(install_ace_library SOURCE_PATH ACE_LIBRARY)
|
||||
set(LIB_PATH ${SOURCE_PATH}/lib/)
|
||||
function(install_ace_library ORIGINAL_PATH ACE_LIBRARY)
|
||||
set(LIB_PATH ${ORIGINAL_PATH}/lib/)
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
# Install the DLL files
|
||||
file(INSTALL
|
||||
|
@ -1,4 +1,4 @@
|
||||
Source: activemq-cpp
|
||||
Version: 3.9.5
|
||||
Version: 3.9.5-1
|
||||
Build-Depends: apr
|
||||
Description: Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.
|
||||
|
@ -5,12 +5,11 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
||||
endif()
|
||||
|
||||
set(VERSION 3.9.5)
|
||||
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/activemq-cpp-library-${VERSION})
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://www.apache.org/dist/activemq/activemq-cpp/${VERSION}/activemq-cpp-library-${VERSION}-src.tar.bz2"
|
||||
FILENAME "activemq-cpp-library-${VERSION}-src.tar.bz2"
|
||||
SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2
|
||||
SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
@ -42,12 +41,12 @@ vcpkg_build_msbuild(
|
||||
)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
|
||||
# Handle copyright
|
||||
file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/activemq-cpp)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/activemq-cpp/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/activemq-cpp/copyright)
|
||||
|
||||
|
||||
|
||||
file(
|
||||
COPY
|
||||
${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.lib
|
||||
|
@ -1,4 +1,4 @@
|
||||
Source: alac-decoder
|
||||
Version: 0.2-1
|
||||
Homepage: https://distfiles.macports.org/alac_decoder
|
||||
Description: ALAC C implementation of a decoder, written from reverse engineering the file format
|
||||
Source: alac-decoder
|
||||
Version: 0.2-3
|
||||
Homepage: https://distfiles.macports.org/alac_decoder
|
||||
Description: ALAC C implementation of a decoder, written from reverse engineering the file format
|
||||
|
@ -1,14 +1,14 @@
|
||||
diff --git a/alac.c b/alac.c
|
||||
index b829e29..8e8805f 100644
|
||||
--- a/alac.c
|
||||
+++ b/alac.c
|
||||
@@ -284,7 +284,9 @@ static int count_leading_zeros(int input)
|
||||
return output;
|
||||
}
|
||||
#else
|
||||
+#if !defined(_MSC_VER)
|
||||
#warning using generic count leading zeroes. You may wish to write one for your CPU / compiler
|
||||
+#endif
|
||||
static int count_leading_zeros(int input)
|
||||
{
|
||||
int output = 0;
|
||||
diff --git a/alac.c b/alac.c
|
||||
index b829e29..8e8805f 100644
|
||||
--- a/alac.c
|
||||
+++ b/alac.c
|
||||
@@ -284,7 +284,9 @@ static int count_leading_zeros(int input)
|
||||
return output;
|
||||
}
|
||||
#else
|
||||
+#if !defined(_MSC_VER)
|
||||
#warning using generic count leading zeroes. You may wish to write one for your CPU / compiler
|
||||
+#endif
|
||||
static int count_leading_zeros(int input)
|
||||
{
|
||||
int output = 0;
|
||||
|
@ -2,33 +2,33 @@ include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/alac_decoder)
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://distfiles.macports.org/alac_decoder/alac_decoder-0.2.0.tgz"
|
||||
FILENAME "alac_decoder-0.2.0.tgz"
|
||||
SHA512 4b37d4fe37681bfccaa4a27fbaf11eb2a1fba5f14e77d219a6d9814ff44d1168534d05eb19443dd2fd11e6fcdf4da3a22e3f3c79314cb7a6767c152351b13e29
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
remove_stdint_headers.patch
|
||||
no-pragma-warning.patch
|
||||
)
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/decomp.c DESTINATION ${SOURCE_PATH})
|
||||
|
||||
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PATCHES
|
||||
${CMAKE_CURRENT_LIST_DIR}/remove_stdint_headers.patch
|
||||
${CMAKE_CURRENT_LIST_DIR}/no-pragma-warning.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
|
||||
OPTIONS_DEBUG
|
||||
-DDISABLE_INSTALL_HEADERS=ON
|
||||
-DDISABLE_INSTALL_TOOLS=ON
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/alac-decoder)
|
||||
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/alac-decoder RENAME copyright)
|
||||
file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: alembic
|
||||
Version: 1.7.11-4
|
||||
Version: 1.7.11-5
|
||||
Build-Depends: ilmbase, hdf5
|
||||
Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.
|
||||
Homepage: https://alembic.io/
|
||||
|
381
ports/alembic/fix-find-openexr-ilmbase.patch
Normal file
381
ports/alembic/fix-find-openexr-ilmbase.patch
Normal file
@ -0,0 +1,381 @@
|
||||
diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake
|
||||
index cd00d70..a73c8db 100644
|
||||
--- a/cmake/AlembicIlmBase.cmake
|
||||
+++ b/cmake/AlembicIlmBase.cmake
|
||||
@@ -33,11 +33,25 @@
|
||||
##
|
||||
##-*****************************************************************************
|
||||
|
||||
-FIND_PACKAGE(IlmBase)
|
||||
+FIND_PACKAGE(OpenEXR)
|
||||
|
||||
-IF (ILMBASE_FOUND)
|
||||
+IF (OPENEXR_FOUND)
|
||||
SET(ALEMBIC_ILMBASE_FOUND 1 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise")
|
||||
|
||||
+ set(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${OpenEXR_INCLUDE_DIRS}/OpenEXR)
|
||||
+ set(ALEMBIC_ILMBASE_HALF_LIB ${OPENEXR_HALF_LIBRARY})
|
||||
+ set(ALEMBIC_ILMBASE_IEX_LIB ${OPENEXR_IEX_LIBRARY})
|
||||
+ set(ALEMBIC_ILMBASE_IEXMATH_LIB ${OpenEXR_IEXMATH_LIBRARY})
|
||||
+ set(ALEMBIC_ILMBASE_ILMTHREAD_LIB ${OPENEXR_ILMTHREAD_LIBRARY})
|
||||
+ set(ALEMBIC_ILMBASE_IMATH_LIB ${OPENEXR_IMATH_LIBRARY})
|
||||
+
|
||||
+ MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
|
||||
+ MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
|
||||
+ MESSAGE( STATUS "IEX LIB: ${ALEMBIC_ILMBASE_IEX_LIB}" )
|
||||
+ MESSAGE( STATUS "IEXMATH LIB: ${ALEMBIC_ILMBASE_IEXMATH_LIB}" )
|
||||
+ MESSAGE( STATUS "ILMTHREAD LIB: ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}" )
|
||||
+ MESSAGE( STATUS "IMATH LIB: ${ALEMBIC_ILMBASE_IMATH_LIB}" )
|
||||
+
|
||||
SET(ALEMBIC_ILMBASE_LIBS
|
||||
${ALEMBIC_ILMBASE_IMATH_LIB}
|
||||
${ALEMBIC_ILMBASE_ILMTHREAD_LIB}
|
||||
diff --git a/cmake/AlembicOpenEXR.cmake b/cmake/AlembicOpenEXR.cmake
|
||||
index 0833b32..a9180cd 100644
|
||||
--- a/cmake/AlembicOpenEXR.cmake
|
||||
+++ b/cmake/AlembicOpenEXR.cmake
|
||||
@@ -38,8 +38,12 @@
|
||||
FIND_PACKAGE( OpenEXR )
|
||||
|
||||
IF( OPENEXR_FOUND )
|
||||
- SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS} )
|
||||
+ SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS}/OpenEXR )
|
||||
SET( ALEMBIC_OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES} )
|
||||
+
|
||||
+ MESSAGE( STATUS "OPENEXR INCLUDE PATH: ${ALEMBIC_OPENEXR_INCLUDE_PATH}" )
|
||||
+ MESSAGE( STATUS "OPENEXR LIB: ${ALEMBIC_OPENEXR_LIBRARIES}" )
|
||||
+
|
||||
# SET( ALEMBIC_OPENEXR_DEFINITIONS ${OPENEXR_DEFINITIONS} )
|
||||
|
||||
SET( ALEMBIC_OPENEXR_FOUND 1 CACHE STRING "Set to 1 if OpenEXR is found, 0 otherwise" )
|
||||
diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
|
||||
deleted file mode 100644
|
||||
index 679a02f..0000000
|
||||
--- a/cmake/Modules/FindIlmBase.cmake
|
||||
+++ /dev/null
|
||||
@@ -1,190 +0,0 @@
|
||||
-##-*****************************************************************************
|
||||
-##
|
||||
-## Copyright (c) 2009-2016,
|
||||
-## Sony Pictures Imageworks Inc. and
|
||||
-## Industrial Light & Magic, a division of Lucasfilm Entertainment Company Ltd.
|
||||
-##
|
||||
-## All rights reserved.
|
||||
-##
|
||||
-## Redistribution and use in source and binary forms, with or without
|
||||
-## modification, are permitted provided that the following conditions are
|
||||
-## met:
|
||||
-## * Redistributions of source code must retain the above copyright
|
||||
-## notice, this list of conditions and the following disclaimer.
|
||||
-## * Redistributions in binary form must reproduce the above
|
||||
-## copyright notice, this list of conditions and the following disclaimer
|
||||
-## in the documentation and/or other materials provided with the
|
||||
-## distribution.
|
||||
-## * Neither the name of Industrial Light & Magic nor the names of
|
||||
-## its contributors may be used to endorse or promote products derived
|
||||
-## from this software without specific prior written permission.
|
||||
-##
|
||||
-## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
-## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
-## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
-## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
-## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
-## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
-## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
-## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
-## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
-##
|
||||
-##-*****************************************************************************
|
||||
-
|
||||
-#-******************************************************************************
|
||||
-#-******************************************************************************
|
||||
-# FIRST, ILMBASE STUFF
|
||||
-#-******************************************************************************
|
||||
-#-******************************************************************************
|
||||
-
|
||||
-# If ILMBASE_ROOT was defined in the environment, use it.
|
||||
-IF(NOT ILMBASE_ROOT AND NOT $ENV{ILMBASE_ROOT} STREQUAL "")
|
||||
- SET(ILMBASE_ROOT $ENV{ILMBASE_ROOT})
|
||||
-ENDIF()
|
||||
-
|
||||
-IF(NOT DEFINED ILMBASE_ROOT)
|
||||
- MESSAGE(STATUS "ILMBASE_ROOT is undefined" )
|
||||
- IF ( ${CMAKE_HOST_UNIX} )
|
||||
- IF( ${DARWIN} )
|
||||
- # TODO: set to default install path when shipping out
|
||||
- SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
|
||||
- ELSE()
|
||||
- # TODO: set to default install path when shipping out
|
||||
- SET( ALEMBIC_ILMBASE_ROOT "/usr/local/ilmbase-1.0.1/" )
|
||||
- ENDIF()
|
||||
- ELSE()
|
||||
- IF ( ${WINDOWS} )
|
||||
- # TODO: set to 32-bit or 64-bit path
|
||||
- SET( ALEMBIC_ILMBASE_ROOT "C:/Program Files (x86)/ilmbase-1.0.1/" )
|
||||
- ELSE()
|
||||
- SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
|
||||
- ENDIF()
|
||||
- ENDIF()
|
||||
-ELSE()
|
||||
- SET( ALEMBIC_ILMBASE_ROOT ${ILMBASE_ROOT} )
|
||||
-ENDIF()
|
||||
-
|
||||
-SET(_ilmbase_FIND_COMPONENTS
|
||||
- Half
|
||||
- Iex
|
||||
- IexMath
|
||||
- IlmThread
|
||||
- Imath
|
||||
-)
|
||||
-
|
||||
-SET(_ilmbase_SEARCH_DIRS
|
||||
- ${ALEMBIC_ILMBASE_ROOT}
|
||||
- ~/Library/Frameworks
|
||||
- /Library/Frameworks
|
||||
- /usr/local
|
||||
- /usr
|
||||
- /sw
|
||||
- /opt/local
|
||||
- /opt/csw
|
||||
- /opt
|
||||
- /usr/freeware
|
||||
-)
|
||||
-
|
||||
-FIND_PATH(ILMBASE_INCLUDE_DIR
|
||||
- NAMES
|
||||
- IlmBaseConfig.h
|
||||
- HINTS
|
||||
- ${_ilmbase_SEARCH_DIRS}
|
||||
- PATH_SUFFIXES
|
||||
- include
|
||||
- include/OpenEXR
|
||||
-)
|
||||
-
|
||||
-# If the headers were found, get the version from config file, if not already set.
|
||||
-IF(ILMBASE_INCLUDE_DIR)
|
||||
- SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${ILMBASE_INCLUDE_DIR})
|
||||
- IF(NOT ILMBASE_VERSION)
|
||||
-
|
||||
- FIND_FILE(_ilmbase_CONFIG
|
||||
- NAMES
|
||||
- IlmBaseConfig.h
|
||||
- PATHS
|
||||
- "${ILMBASE_INCLUDE_DIR}"
|
||||
- "${ILMBASE_INCLUDE_DIR}/OpenEXR"
|
||||
- )
|
||||
-
|
||||
- IF(_ilmbase_CONFIG)
|
||||
- FILE(STRINGS "${_ilmbase_CONFIG}" ILMBASE_BUILD_SPECIFICATION
|
||||
- REGEX "^[ \t]*#define[ \t]+(ILMBASE_VERSION_STRING|VERSION)[ \t]+\"[.0-9]+\".*$")
|
||||
- ELSE()
|
||||
- MESSAGE(WARNING "Could not find \"OpenEXRConfig.h\" in \"${ILMBASE_INCLUDE_DIR}\"")
|
||||
- ENDIF()
|
||||
-
|
||||
- IF(ILMBASE_BUILD_SPECIFICATION)
|
||||
- STRING(REGEX REPLACE ".*#define[ \t]+(ILMBASE_VERSION_STRING|VERSION)[ \t]+\"([.0-9]+)\".*"
|
||||
- "\\2" _ilmbase_libs_ver_init ${ILMBASE_BUILD_SPECIFICATION})
|
||||
- ELSE()
|
||||
- MESSAGE(WARNING "Could not determine ILMBase library version, assuming ${_ilmbase_libs_ver_init}.")
|
||||
- ENDIF()
|
||||
-
|
||||
- UNSET(_ilmbase_CONFIG CACHE)
|
||||
-
|
||||
- ENDIF()
|
||||
-
|
||||
- SET("ILMBASE_VERSION" ${_ilmbase_libs_ver_init} CACHE STRING "Version of OpenEXR lib")
|
||||
- UNSET(_ilmbase_libs_ver_init)
|
||||
-
|
||||
- STRING(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION})
|
||||
-ENDIF()
|
||||
-
|
||||
-
|
||||
-SET(_ilmbase_LIBRARIES)
|
||||
-FOREACH(COMPONENT ${_ilmbase_FIND_COMPONENTS})
|
||||
- STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
|
||||
-
|
||||
- FIND_LIBRARY(ALEMBIC_ILMBASE_${UPPERCOMPONENT}_LIB
|
||||
- NAMES
|
||||
- ${COMPONENT}-${_ilmbase_libs_ver} ${COMPONENT}
|
||||
- HINTS
|
||||
- ${_ilmbase_SEARCH_DIRS}
|
||||
- PATH_SUFFIXES
|
||||
- lib64 lib
|
||||
- )
|
||||
- LIST(APPEND _ilmbase_LIBRARIES "${ILMBASE_${UPPERCOMPONENT}_LIBRARY}")
|
||||
-ENDFOREACH()
|
||||
-
|
||||
-UNSET(_ilmbase_libs_ver)
|
||||
-
|
||||
-IF ( ${ALEMBIC_ILMBASE_HALF_LIB} STREQUAL "ALEMBIC_ILMBASE_HALF_LIB-NOTFOUND" )
|
||||
- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
|
||||
-ENDIF()
|
||||
-
|
||||
-IF ( ${ALEMBIC_ILMBASE_IEX_LIB} STREQUAL "ALEMBIC_ILMBASE_IEX_LIB-NOTFOUND" )
|
||||
- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
|
||||
-ENDIF()
|
||||
-
|
||||
-IF ( DEFINED USE_IEXMATH AND USE_IEXMATH )
|
||||
- IF ( ${ALEMBIC_ILMBASE_IEXMATH_LIB} STREQUAL
|
||||
- "ALEMBIC_ILMBASE_IEXMATH_LIB-NOTFOUND" )
|
||||
- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IexMath, IlmThread, Imath) not found, required" )
|
||||
- ENDIF()
|
||||
-ENDIF()
|
||||
-
|
||||
-IF ( ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} STREQUAL "ALEMBIC_ILMBASE_ILMTHREAD_LIB-NOTFOUND" )
|
||||
- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
|
||||
-ENDIF()
|
||||
-
|
||||
-IF ( ${ALEMBIC_ILMBASE_IMATH_LIB} STREQUAL "ALEMBIC_ILMBASE_IMATH_LIB-NOTFOUND" )
|
||||
- MESSAGE( FATAL_ERROR "ilmbase libraries (Half, Iex, IlmThread, Imath) not found, required" )
|
||||
-ENDIF()
|
||||
-
|
||||
-IF ( ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY} STREQUAL "ALEMBIC_ILMBASE_INCLUDE_DIRECTORY-NOTFOUND" )
|
||||
- MESSAGE( FATAL_ERROR "ilmbase header files not found, required: ALEMBIC_ILMBASE_ROOT: ${ALEMBIC_ILMBASE_ROOT}" )
|
||||
-ENDIF()
|
||||
-
|
||||
-
|
||||
-MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
|
||||
-MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
|
||||
-MESSAGE( STATUS "IEX LIB: ${ALEMBIC_ILMBASE_IEX_LIB}" )
|
||||
-MESSAGE( STATUS "IEXMATH LIB: ${ALEMBIC_ILMBASE_IEXMATH_LIB}" )
|
||||
-MESSAGE( STATUS "ILMTHREAD LIB: ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}" )
|
||||
-MESSAGE( STATUS "IMATH LIB: ${ALEMBIC_ILMBASE_IMATH_LIB}" )
|
||||
-
|
||||
-SET( ILMBASE_FOUND TRUE )
|
||||
diff --git a/cmake/Modules/FindOpenEXR.cmake b/cmake/Modules/FindOpenEXR.cmake
|
||||
deleted file mode 100644
|
||||
index 935fe6f..0000000
|
||||
--- a/cmake/Modules/FindOpenEXR.cmake
|
||||
+++ /dev/null
|
||||
@@ -1,129 +0,0 @@
|
||||
-##-*****************************************************************************
|
||||
-##
|
||||
-## Copyright (c) 2009-2011,
|
||||
-## Sony Pictures Imageworks Inc. and
|
||||
-## Industrial Light & Magic, a division of Lucasfilm Entertainment Company Ltd.
|
||||
-##
|
||||
-## All rights reserved.
|
||||
-##
|
||||
-## Redistribution and use in source and binary forms, with or without
|
||||
-## modification, are permitted provided that the following conditions are
|
||||
-## met:
|
||||
-## * Redistributions of source code must retain the above copyright
|
||||
-## notice, this list of conditions and the following disclaimer.
|
||||
-## * Redistributions in binary form must reproduce the above
|
||||
-## copyright notice, this list of conditions and the following disclaimer
|
||||
-## in the documentation and/or other materials provided with the
|
||||
-## distribution.
|
||||
-## * Neither the name of Industrial Light & Magic nor the names of
|
||||
-## its contributors may be used to endorse or promote products derived
|
||||
-## from this software without specific prior written permission.
|
||||
-##
|
||||
-## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
-## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
-## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
-## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
-## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
-## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
-## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
-## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
-## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
-## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
-## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
-##
|
||||
-##-*****************************************************************************
|
||||
-
|
||||
-
|
||||
-# We shall worry about windowsification later.
|
||||
-
|
||||
-#-******************************************************************************
|
||||
-#-******************************************************************************
|
||||
-# NOW, OPENEXR STUFF. EXR IS OPTIONAL, WHERASE ILMBASE IS NOT
|
||||
-#-******************************************************************************
|
||||
-#-******************************************************************************
|
||||
-
|
||||
-IF(NOT DEFINED OPENEXR_ROOT)
|
||||
- IF ( ${CMAKE_HOST_UNIX} )
|
||||
- IF( ${DARWIN} )
|
||||
- # TODO: set to default install path when shipping out
|
||||
- SET( ALEMBIC_OPENEXR_ROOT NOTFOUND )
|
||||
- ELSE()
|
||||
- # TODO: set to default install path when shipping out
|
||||
- SET( ALEMBIC_OPENEXR_ROOT "/usr/local/openexr-1.6.1/" )
|
||||
- ENDIF()
|
||||
- ELSE()
|
||||
- IF ( ${WINDOWS} )
|
||||
- # TODO: set to 32-bit or 64-bit path
|
||||
- SET( ALEMBIC_OPENEXR_ROOT NOTFOUND )
|
||||
- ELSE()
|
||||
- SET( ALEMBIC_OPENEXR_ROOT NOTFOUND )
|
||||
- ENDIF()
|
||||
- ENDIF()
|
||||
-ELSE()
|
||||
- SET( ALEMBIC_OPENEXR_ROOT ${OPENEXR_ROOT} )
|
||||
-ENDIF()
|
||||
-
|
||||
-IF(NOT $ENV{OPENEXR_ROOT}x STREQUAL "x")
|
||||
- SET( ALEMBIC_OPENEXR_ROOT $ENV{OPENEXR_ROOT})
|
||||
-ELSE()
|
||||
- SET( ENV{OPENEXR_ROOT} ${OPENEXR_ROOT} )
|
||||
-ENDIF()
|
||||
-
|
||||
-
|
||||
-SET(LIBRARY_PATHS
|
||||
- ${ALEMBIC_OPENEXR_ROOT}/lib
|
||||
- ~/Library/Frameworks
|
||||
- /Library/Frameworks
|
||||
- /usr/local/lib
|
||||
- /usr/lib
|
||||
- /sw/lib
|
||||
- /opt/local/lib
|
||||
- /opt/csw/lib
|
||||
- /opt/lib
|
||||
- /usr/freeware/lib64
|
||||
-)
|
||||
-
|
||||
-SET(INCLUDE_PATHS
|
||||
- ${ALEMBIC_OPENEXR_ROOT}/include/OpenEXR/
|
||||
- ~/Library/Frameworks
|
||||
- /Library/Frameworks
|
||||
- /usr/local/include/OpenEXR/
|
||||
- /usr/local/include
|
||||
- /usr/include
|
||||
- /sw/include # Fink
|
||||
- /opt/local/include # DarwinPorts
|
||||
- /opt/csw/include # Blastwave
|
||||
- /opt/include
|
||||
- /usr/freeware/include
|
||||
-)
|
||||
-
|
||||
-FIND_PATH( ALEMBIC_OPENEXR_INCLUDE_PATH ImfRgba.h
|
||||
- PATHS
|
||||
- ${INCLUDE_PATHS}
|
||||
- DOC "The directory where ImfRgba.h resides" )
|
||||
-
|
||||
-FIND_LIBRARY( ALEMBIC_OPENEXR_ILMIMF_LIB IlmImf
|
||||
- PATHS
|
||||
- ${LIBRARY_PATHS}
|
||||
- DOC "The IlmImf library" )
|
||||
-
|
||||
-
|
||||
-SET( OPENEXR_FOUND TRUE )
|
||||
-
|
||||
-IF ( ${ALEMBIC_OPENEXR_INCLUDE_PATH} STREQUAL "ALEMBIC_OPENEXR_INCLUDE_PATH-NOTFOUND" )
|
||||
- MESSAGE( STATUS "OpenEXR include path not found, disabling" )
|
||||
- SET( OPENEXR_FOUND FALSE )
|
||||
-ENDIF()
|
||||
-
|
||||
-IF ( ${ALEMBIC_OPENEXR_ILMIMF_LIB} STREQUAL "ALEMBIC_OPENEXR_ILMIMF_LIB-NOTFOUND" )
|
||||
- MESSAGE( STATUS "OpenEXR libraries not found, disabling" )
|
||||
- SET( OPENEXR_FOUND FALSE )
|
||||
- SET( ALEMBIC_OPENEXR_LIBS NOTFOUND )
|
||||
-ENDIF()
|
||||
-
|
||||
-IF (OPENEXR_FOUND)
|
||||
- MESSAGE( STATUS "OPENEXR INCLUDE PATH: ${ALEMBIC_OPENEXR_INCLUDE_PATH}" )
|
||||
- SET( ALEMBIC_OPENEXR_LIBS ${ALEMBIC_OPENEXR_ILMIMF_LIB} )
|
||||
-ENDIF()
|
||||
-
|
||||
-
|
@ -1,11 +1,6 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
|
||||
if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
|
||||
message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n"
|
||||
"We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
|
||||
)
|
||||
endif()
|
||||
vcpkg_buildpath_length_warning(37)
|
||||
|
||||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
||||
|
||||
@ -17,6 +12,7 @@ vcpkg_from_github(
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-C1083.patch
|
||||
fix-find-openexr-ilmbase.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
|
@ -1,6 +1,6 @@
|
||||
Source: angelscript
|
||||
Version: 2.33.1-1
|
||||
Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.
|
||||
|
||||
Feature: addons
|
||||
Description: Installs all addons for use in compiling scripts addons
|
||||
Source: angelscript
|
||||
Version: 2.34.0
|
||||
Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.
|
||||
|
||||
Feature: addons
|
||||
Description: Installs all addons for use in compiling scripts addons
|
||||
|
@ -1,13 +1,13 @@
|
||||
AngelCode Scripting Library
|
||||
|
||||
Copyright © 2003-2018 Andreas Jönsson
|
||||
|
||||
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
|
||||
|
||||
The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
|
||||
|
||||
Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
|
||||
|
||||
This notice may not be removed or altered from any source distribution.
|
||||
AngelCode Scripting Library
|
||||
|
||||
Copyright © 2003-2018 Andreas Jönsson
|
||||
|
||||
This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
|
||||
|
||||
The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
|
||||
|
||||
Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
|
||||
|
||||
This notice may not be removed or altered from any source distribution.
|
||||
|
@ -1,13 +1,13 @@
|
||||
diff --git a/angelscript/projects/cmake/CMakeLists.txt b/angelscript/projects/cmake/CMakeLists.txt
|
||||
index 7c800c5..982ad8b 100644
|
||||
--- a/angelscript/projects/cmake/CMakeLists.txt
|
||||
+++ b/angelscript/projects/cmake/CMakeLists.txt
|
||||
@@ -145,7 +145,7 @@ endif()
|
||||
|
||||
# Don't override the default library output path to avoid conflicts when building for multiple target platforms
|
||||
#set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib)
|
||||
-target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads)
|
||||
+target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE Threads::Threads)
|
||||
|
||||
set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
|
||||
|
||||
diff --git a/angelscript/projects/cmake/CMakeLists.txt b/angelscript/projects/cmake/CMakeLists.txt
|
||||
index 7c800c5..982ad8b 100644
|
||||
--- a/angelscript/projects/cmake/CMakeLists.txt
|
||||
+++ b/angelscript/projects/cmake/CMakeLists.txt
|
||||
@@ -145,7 +145,7 @@ endif()
|
||||
|
||||
# Don't override the default library output path to avoid conflicts when building for multiple target platforms
|
||||
#set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib)
|
||||
-target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads)
|
||||
+target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE Threads::Threads)
|
||||
|
||||
set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
|
||||
|
||||
|
@ -1,38 +1,31 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.33.0.zip"
|
||||
FILENAME "angelscript_2.33.0.zip"
|
||||
SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
mark-threads-private.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake
|
||||
PREFER_NINJA # Disable this option if project cannot be built with Ninja
|
||||
# OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
|
||||
# OPTIONS_RELEASE -DOPTIMIZE=1
|
||||
# OPTIONS_DEBUG -DDEBUGGABLE=1
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript)
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angelscript RENAME copyright)
|
||||
|
||||
# Copy the addon files
|
||||
if("addons" IN_LIST FEATURES)
|
||||
file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp")
|
||||
endif()
|
||||
|
||||
# Post-build test for cmake libraries
|
||||
# vcpkg_test_cmake(PACKAGE_NAME angelscript)
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.34.0.zip"
|
||||
FILENAME "angelscript_2.34.0.zip"
|
||||
SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
mark-threads-private.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake
|
||||
PREFER_NINJA
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript)
|
||||
|
||||
# Copy the addon files
|
||||
if("addons" IN_LIST FEATURES)
|
||||
file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp")
|
||||
endif()
|
||||
|
||||
file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
@ -1,274 +1,262 @@
|
||||
diff --git a/src/common/system_utils_win.cpp b/src/common/system_utils_win.cpp
|
||||
index e4c146091..974b1b3ba 100644
|
||||
--- a/src/common/system_utils_win.cpp
|
||||
+++ b/src/common/system_utils_win.cpp
|
||||
@@ -110,7 +110,7 @@ class Win32Library : public Library
|
||||
int ret = snprintf(buffer, MAX_PATH, "%s.%s", libraryName, GetSharedLibraryExtension());
|
||||
if (ret > 0 && ret < MAX_PATH)
|
||||
{
|
||||
- mModule = LoadLibraryA(buffer);
|
||||
+ // mModule = LoadLibraryA(buffer);
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/src/libANGLE/renderer/d3d/RendererD3D.cpp b/src/libANGLE/renderer/d3d/RendererD3D.cpp
|
||||
index 2a8d0221b..362c95a6f 100644
|
||||
--- a/src/libANGLE/renderer/d3d/RendererD3D.cpp
|
||||
+++ b/src/libANGLE/renderer/d3d/RendererD3D.cpp
|
||||
@@ -229,7 +229,6 @@ GLenum DefaultGLErrorCode(HRESULT hr)
|
||||
{
|
||||
switch (hr)
|
||||
{
|
||||
- case D3DERR_OUTOFVIDEOMEMORY:
|
||||
case E_OUTOFMEMORY:
|
||||
return GL_OUT_OF_MEMORY;
|
||||
default:
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
|
||||
index 9da5cfdae..6eaab6aa7 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
#include "common/tls.h"
|
||||
#include "common/utilities.h"
|
||||
+#include "common/debug.h"
|
||||
#include "libANGLE/Buffer.h"
|
||||
#include "libANGLE/Context.h"
|
||||
#include "libANGLE/Display.h"
|
||||
@@ -1189,10 +1190,11 @@ void Renderer11::generateDisplayExtensions(egl::DisplayExtensions *outExtensions
|
||||
outExtensions->robustResourceInitialization = true;
|
||||
|
||||
// Compositor Native Window capabilies require WinVer >= 1803
|
||||
- if (CompositorNativeWindow11::IsSupportedWinRelease())
|
||||
- {
|
||||
- outExtensions->windowsUIComposition = true;
|
||||
- }
|
||||
+#ifdef ANGLE_ENABLE_WINDOWS_STORE
|
||||
+ outExtensions->windowsUIComposition = NativeWindow11WinRT::IsSupportedWin10Release();
|
||||
+#else
|
||||
+outExtensions->windowsUIComposition = CompositorNativeWindow11::IsSupportedWinRelease();
|
||||
+#endif
|
||||
}
|
||||
|
||||
angle::Result Renderer11::flush(Context11 *context11)
|
||||
@@ -1266,16 +1268,24 @@ NativeWindowD3D *Renderer11::createNativeWindow(EGLNativeWindowType window,
|
||||
const egl::Config *config,
|
||||
const egl::AttributeMap &attribs) const
|
||||
{
|
||||
- auto useWinUiComp = window != nullptr && !NativeWindow11Win32::IsValidNativeWindow(window);
|
||||
+#ifdef ANGLE_ENABLE_WINDOWS_STORE
|
||||
+ auto useWinUiComp = window != nullptr && !NativeWindow11WinRT::IsValidNativeWindow(window);
|
||||
+#else
|
||||
+ auto useWinUiComp = window != nullptr && !NativeWindow11Win32::IsValidNativeWindow(window);
|
||||
+#endif
|
||||
|
||||
if (useWinUiComp)
|
||||
{
|
||||
- return new CompositorNativeWindow11(window, config->alphaSize > 0);
|
||||
+#ifdef ANGLE_ENABLE_WINDOWS_STORE
|
||||
+ return new NativeWindow11WinRT(window, config->alphaSize > 0);
|
||||
+#else
|
||||
+ return new CompositorNativeWindow11(window, config->alphaSize > 0);
|
||||
+#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef ANGLE_ENABLE_WINDOWS_STORE
|
||||
- UNUSED_VARIABLE(attribs);
|
||||
+ ANGLE_UNUSED_VARIABLE(attribs);
|
||||
return new NativeWindow11WinRT(window, config->alphaSize > 0);
|
||||
#else
|
||||
return new NativeWindow11Win32(
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
|
||||
index cb2f279e4..a8761e29c 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
|
||||
@@ -145,6 +145,7 @@ HRESULT CoreWindowNativeWindow::createSwapChain(ID3D11Device *device,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
bool containsAlpha,
|
||||
+ unsigned int samples,
|
||||
IDXGISwapChain1 **swapChain)
|
||||
{
|
||||
if (device == nullptr || factory == nullptr || swapChain == nullptr || width == 0 ||
|
||||
@@ -158,6 +159,7 @@ HRESULT CoreWindowNativeWindow::createSwapChain(ID3D11Device *device,
|
||||
swapChainDesc.Height = height;
|
||||
swapChainDesc.Format = format;
|
||||
swapChainDesc.Stereo = FALSE;
|
||||
+ swapChainDesc.SampleDesc.Count = samples;
|
||||
swapChainDesc.SampleDesc.Count = 1;
|
||||
swapChainDesc.SampleDesc.Quality = 0;
|
||||
swapChainDesc.BufferUsage =
|
||||
@@ -213,11 +215,9 @@ HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWind
|
||||
|
||||
static float GetLogicalDpi()
|
||||
{
|
||||
- ComPtr<ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> displayProperties;
|
||||
+ ComPtr<ABI::Windows::Graphics::Display::IDisplayInformation> displayProperties;
|
||||
|
||||
- if (SUCCEEDED(GetActivationFactory(
|
||||
- HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(),
|
||||
- displayProperties.GetAddressOf())))
|
||||
+ if (SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(), displayProperties.GetAddressOf())))
|
||||
{
|
||||
float dpi = 96.0f;
|
||||
if (SUCCEEDED(displayProperties->get_LogicalDpi(&dpi)))
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
|
||||
index ae57cfb83..983a20ada 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
|
||||
@@ -36,6 +36,7 @@ class CoreWindowNativeWindow : public InspectableNativeWindow,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
bool containsAlpha,
|
||||
+ unsigned int samples,
|
||||
IDXGISwapChain1 **swapChain) override;
|
||||
|
||||
protected:
|
||||
@@ -49,7 +50,7 @@ class CoreWindowNativeWindow : public InspectableNativeWindow,
|
||||
ComPtr<IMap<HSTRING, IInspectable *>> mPropertyMap;
|
||||
};
|
||||
|
||||
-[uuid(7F924F66 - EBAE - 40E5 - A10B - B8F35E245190)] class CoreWindowSizeChangedHandler
|
||||
+[uuid(7F924F66-EBAE-40E5-A10B-B8F35E245190)] class CoreWindowSizeChangedHandler
|
||||
: public Microsoft::WRL::RuntimeClass<
|
||||
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
|
||||
IWindowSizeChangedEventHandler>
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
|
||||
index 708e8a212..aa6c6f375 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
|
||||
@@ -53,6 +53,7 @@ class InspectableNativeWindow
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
bool containsAlpha,
|
||||
+ unsigned int samples,
|
||||
IDXGISwapChain1 **swapChain) = 0;
|
||||
|
||||
bool getClientRect(RECT *rect)
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
|
||||
index 8972ca227..ed3576a8c 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
|
||||
@@ -13,6 +13,8 @@
|
||||
#include "libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h"
|
||||
#include "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h"
|
||||
|
||||
+#include <windows.foundation.metadata.h>
|
||||
+
|
||||
using namespace Microsoft::WRL;
|
||||
using namespace Microsoft::WRL::Wrappers;
|
||||
|
||||
@@ -88,6 +90,7 @@ HRESULT NativeWindow11WinRT::createSwapChain(ID3D11Device *device,
|
||||
DXGI_FORMAT format,
|
||||
UINT width,
|
||||
UINT height,
|
||||
+ UINT samples,
|
||||
IDXGISwapChain **swapChain)
|
||||
{
|
||||
if (mImpl)
|
||||
@@ -95,7 +98,7 @@ HRESULT NativeWindow11WinRT::createSwapChain(ID3D11Device *device,
|
||||
IDXGIFactory2 *factory2 = d3d11::DynamicCastComObject<IDXGIFactory2>(factory);
|
||||
IDXGISwapChain1 *swapChain1 = nullptr;
|
||||
HRESULT result =
|
||||
- mImpl->createSwapChain(device, factory2, format, width, height, mHasAlpha, &swapChain1);
|
||||
+ mImpl->createSwapChain(device, factory2, format, width, height, mHasAlpha, samples, &swapChain1);
|
||||
SafeRelease(factory2);
|
||||
*swapChain = static_cast<IDXGISwapChain *>(swapChain1);
|
||||
return result;
|
||||
@@ -119,4 +122,44 @@ bool NativeWindow11WinRT::IsValidNativeWindow(EGLNativeWindowType window)
|
||||
return IsCoreWindow(window) || IsSwapChainPanel(window) || IsEGLConfiguredPropertySet(window);
|
||||
}
|
||||
|
||||
+bool NativeWindow11WinRT::IsSupportedWin10Release()
|
||||
+{
|
||||
+ HSTRING className, contractName;
|
||||
+ HSTRING_HEADER classNameHeader, contractNameHeader;
|
||||
+ boolean isSupported = false;
|
||||
+
|
||||
+ const wchar_t *str = static_cast<const wchar_t *>(RuntimeClass_Windows_Foundation_Metadata_ApiInformation);
|
||||
+ unsigned int length;
|
||||
+ SizeTToUInt32(::wcslen(str), &length);
|
||||
+ HRESULT hr = WindowsCreateStringReference(RuntimeClass_Windows_Foundation_Metadata_ApiInformation, length, &classNameHeader, &className);
|
||||
+
|
||||
+ if (FAILED(hr))
|
||||
+ {
|
||||
+ return isSupported;
|
||||
+ }
|
||||
+
|
||||
+ Microsoft::WRL::ComPtr<ABI::Windows::Foundation::Metadata::IApiInformationStatics> api;
|
||||
+
|
||||
+ hr = RoGetActivationFactory(className, __uuidof(ABI::Windows::Foundation::Metadata::IApiInformationStatics), &api);
|
||||
+
|
||||
+ if (FAILED(hr))
|
||||
+ {
|
||||
+ return isSupported;
|
||||
+ }
|
||||
+
|
||||
+ str = static_cast<const wchar_t *>(L"Windows.Foundation.UniversalApiContract");
|
||||
+ SizeTToUInt32(::wcslen(str), &length);
|
||||
+ hr = WindowsCreateStringReference(L"Windows.Foundation.UniversalApiContract", length, &contractNameHeader,
|
||||
+ &contractName);
|
||||
+
|
||||
+ if (FAILED(hr))
|
||||
+ {
|
||||
+ return isSupported;
|
||||
+ }
|
||||
+
|
||||
+ api->IsApiContractPresentByMajor(contractName, 6, &isSupported);
|
||||
+
|
||||
+ return isSupported;
|
||||
+}
|
||||
+
|
||||
} // namespace rx
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
|
||||
index eac5b21b7..36b20371e 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
|
||||
@@ -34,11 +34,13 @@ class NativeWindow11WinRT : public NativeWindow11
|
||||
DXGI_FORMAT format,
|
||||
UINT width,
|
||||
UINT height,
|
||||
+ UINT samples,
|
||||
IDXGISwapChain **swapChain) override;
|
||||
|
||||
void commitChange() override;
|
||||
|
||||
static bool IsValidNativeWindow(EGLNativeWindowType window);
|
||||
+ static bool IsSupportedWin10Release();
|
||||
|
||||
private:
|
||||
bool mHasAlpha;
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
|
||||
index af0beb635..9f7face1b 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
|
||||
@@ -247,6 +247,7 @@ HRESULT SwapChainPanelNativeWindow::createSwapChain(ID3D11Device *device,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
bool containsAlpha,
|
||||
+ unsigned int samples,
|
||||
IDXGISwapChain1 **swapChain)
|
||||
{
|
||||
if (device == nullptr || factory == nullptr || swapChain == nullptr || width == 0 ||
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
|
||||
index 09642eec5..1f2c090d5 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
|
||||
@@ -28,6 +28,7 @@ class SwapChainPanelNativeWindow : public InspectableNativeWindow,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
bool containsAlpha,
|
||||
+ unsigned int samples,
|
||||
IDXGISwapChain1 **swapChain) override;
|
||||
|
||||
protected:
|
||||
@@ -43,7 +44,7 @@ class SwapChainPanelNativeWindow : public InspectableNativeWindow,
|
||||
ComPtr<IDXGISwapChain1> mSwapChain;
|
||||
};
|
||||
|
||||
-[uuid(8ACBD974 - 8187 - 4508 - AD80 - AEC77F93CF36)] class SwapChainPanelSizeChangedHandler
|
||||
+[uuid(8ACBD974-8187-4508-AD80-AEC77F93CF36)] class SwapChainPanelSizeChangedHandler
|
||||
: public Microsoft::WRL::RuntimeClass<
|
||||
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
|
||||
ABI::Windows::UI::Xaml::ISizeChangedEventHandler>
|
||||
diff --git a/src/libANGLE/renderer/d3d/RendererD3D.cpp b/src/libANGLE/renderer/d3d/RendererD3D.cpp
|
||||
index fa46476..ad56164 100644
|
||||
--- a/src/libANGLE/renderer/d3d/RendererD3D.cpp
|
||||
+++ b/src/libANGLE/renderer/d3d/RendererD3D.cpp
|
||||
@@ -240,7 +240,6 @@ GLenum DefaultGLErrorCode(HRESULT hr)
|
||||
{
|
||||
switch (hr)
|
||||
{
|
||||
- case D3DERR_OUTOFVIDEOMEMORY:
|
||||
case E_OUTOFMEMORY:
|
||||
return GL_OUT_OF_MEMORY;
|
||||
default:
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
|
||||
index 62f263b..b8efe15 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
#include "common/tls.h"
|
||||
#include "common/utilities.h"
|
||||
+#include "common/debug.h"
|
||||
#include "libANGLE/Buffer.h"
|
||||
#include "libANGLE/Context.h"
|
||||
#include "libANGLE/Display.h"
|
||||
@@ -1142,9 +1143,11 @@ void Renderer11::generateDisplayExtensions(egl::DisplayExtensions *outExtensions
|
||||
|
||||
// Compositor Native Window capabilies require WinVer >= 1803
|
||||
if (CompositorNativeWindow11::IsSupportedWinRelease())
|
||||
- {
|
||||
- outExtensions->windowsUIComposition = true;
|
||||
- }
|
||||
+ #ifdef ANGLE_ENABLE_WINDOWS_STORE
|
||||
+ outExtensions->windowsUIComposition = NativeWindow11WinRT::IsSupportedWin10Release();
|
||||
+ #else
|
||||
+ outExtensions->windowsUIComposition = CompositorNativeWindow11::IsSupportedWinRelease();
|
||||
+ #endif
|
||||
}
|
||||
|
||||
angle::Result Renderer11::flush(Context11 *context11)
|
||||
@@ -1218,16 +1221,23 @@ NativeWindowD3D *Renderer11::createNativeWindow(EGLNativeWindowType window,
|
||||
const egl::Config *config,
|
||||
const egl::AttributeMap &attribs) const
|
||||
{
|
||||
- auto useWinUiComp = window != nullptr && !NativeWindow11Win32::IsValidNativeWindow(window);
|
||||
-
|
||||
+#ifdef ANGLE_ENABLE_WINDOWS_STORE
|
||||
+ auto useWinUiComp = window != nullptr && !NativeWindow11WinRT::IsValidNativeWindow(window);
|
||||
+#else
|
||||
+ auto useWinUiComp = window != nullptr && !NativeWindow11Win32::IsValidNativeWindow(window);
|
||||
+#endif
|
||||
if (useWinUiComp)
|
||||
{
|
||||
- return new CompositorNativeWindow11(window, config->alphaSize > 0);
|
||||
+#ifdef ANGLE_ENABLE_WINDOWS_STORE
|
||||
+ return new NativeWindow11WinRT(window, config->alphaSize > 0);
|
||||
+#else
|
||||
+ return new CompositorNativeWindow11(window, config->alphaSize > 0);
|
||||
+#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef ANGLE_ENABLE_WINDOWS_STORE
|
||||
- UNUSED_VARIABLE(attribs);
|
||||
+ ANGLE_UNUSED_VARIABLE(attribs);
|
||||
return new NativeWindow11WinRT(window, config->alphaSize > 0);
|
||||
#else
|
||||
return new NativeWindow11Win32(
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
|
||||
index cb2f279..d76905c 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.cpp
|
||||
@@ -145,6 +145,7 @@ HRESULT CoreWindowNativeWindow::createSwapChain(ID3D11Device *device,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
bool containsAlpha,
|
||||
+ unsigned int samples,
|
||||
IDXGISwapChain1 **swapChain)
|
||||
{
|
||||
if (device == nullptr || factory == nullptr || swapChain == nullptr || width == 0 ||
|
||||
@@ -158,6 +159,7 @@ HRESULT CoreWindowNativeWindow::createSwapChain(ID3D11Device *device,
|
||||
swapChainDesc.Height = height;
|
||||
swapChainDesc.Format = format;
|
||||
swapChainDesc.Stereo = FALSE;
|
||||
+ swapChainDesc.SampleDesc.Count = samples;
|
||||
swapChainDesc.SampleDesc.Count = 1;
|
||||
swapChainDesc.SampleDesc.Quality = 0;
|
||||
swapChainDesc.BufferUsage =
|
||||
@@ -213,11 +215,9 @@ HRESULT GetCoreWindowSizeInPixels(const ComPtr<ABI::Windows::UI::Core::ICoreWind
|
||||
|
||||
static float GetLogicalDpi()
|
||||
{
|
||||
- ComPtr<ABI::Windows::Graphics::Display::IDisplayPropertiesStatics> displayProperties;
|
||||
-
|
||||
- if (SUCCEEDED(GetActivationFactory(
|
||||
- HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayProperties).Get(),
|
||||
- displayProperties.GetAddressOf())))
|
||||
+ ComPtr<ABI::Windows::Graphics::Display::IDisplayInformation> displayProperties;
|
||||
+ if (SUCCEEDED(GetActivationFactory(HStringReference(RuntimeClass_Windows_Graphics_Display_DisplayInformation).Get(),
|
||||
+ displayProperties.GetAddressOf())))
|
||||
{
|
||||
float dpi = 96.0f;
|
||||
if (SUCCEEDED(displayProperties->get_LogicalDpi(&dpi)))
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
|
||||
index ae57cfb..dd77b42 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/CoreWindowNativeWindow.h
|
||||
@@ -36,6 +36,7 @@ class CoreWindowNativeWindow : public InspectableNativeWindow,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
bool containsAlpha,
|
||||
+ unsigned int samples,
|
||||
IDXGISwapChain1 **swapChain) override;
|
||||
|
||||
protected:
|
||||
@@ -49,7 +50,7 @@ class CoreWindowNativeWindow : public InspectableNativeWindow,
|
||||
ComPtr<IMap<HSTRING, IInspectable *>> mPropertyMap;
|
||||
};
|
||||
|
||||
-[uuid(7F924F66 - EBAE - 40E5 - A10B - B8F35E245190)] class CoreWindowSizeChangedHandler
|
||||
+[uuid(7F924F66-EBAE-40E5-A10B-B8F35E245190)] class CoreWindowSizeChangedHandler
|
||||
: public Microsoft::WRL::RuntimeClass<
|
||||
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
|
||||
IWindowSizeChangedEventHandler>
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
|
||||
index 708e8a2..9bfa4c4 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h
|
||||
@@ -53,6 +53,7 @@ class InspectableNativeWindow
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
bool containsAlpha,
|
||||
+ unsigned int samples,
|
||||
IDXGISwapChain1 **swapChain) = 0;
|
||||
|
||||
bool getClientRect(RECT *rect)
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
|
||||
index 8972ca2..caf2a7e 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.cpp
|
||||
@@ -13,6 +13,8 @@
|
||||
#include "libANGLE/renderer/d3d/d3d11/winrt/InspectableNativeWindow.h"
|
||||
#include "libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h"
|
||||
|
||||
+#include <windows.foundation.metadata.h>
|
||||
+
|
||||
using namespace Microsoft::WRL;
|
||||
using namespace Microsoft::WRL::Wrappers;
|
||||
|
||||
@@ -88,6 +90,7 @@ HRESULT NativeWindow11WinRT::createSwapChain(ID3D11Device *device,
|
||||
DXGI_FORMAT format,
|
||||
UINT width,
|
||||
UINT height,
|
||||
+ UINT samples,
|
||||
IDXGISwapChain **swapChain)
|
||||
{
|
||||
if (mImpl)
|
||||
@@ -95,7 +98,7 @@ HRESULT NativeWindow11WinRT::createSwapChain(ID3D11Device *device,
|
||||
IDXGIFactory2 *factory2 = d3d11::DynamicCastComObject<IDXGIFactory2>(factory);
|
||||
IDXGISwapChain1 *swapChain1 = nullptr;
|
||||
HRESULT result =
|
||||
- mImpl->createSwapChain(device, factory2, format, width, height, mHasAlpha, &swapChain1);
|
||||
+ mImpl->createSwapChain(device, factory2, format, width, height, mHasAlpha, samples, &swapChain1);
|
||||
SafeRelease(factory2);
|
||||
*swapChain = static_cast<IDXGISwapChain *>(swapChain1);
|
||||
return result;
|
||||
@@ -118,5 +121,44 @@ bool NativeWindow11WinRT::IsValidNativeWindow(EGLNativeWindowType window)
|
||||
// Anything else will be rejected as an invalid IInspectable.
|
||||
return IsCoreWindow(window) || IsSwapChainPanel(window) || IsEGLConfiguredPropertySet(window);
|
||||
}
|
||||
+bool NativeWindow11WinRT::IsSupportedWin10Release()
|
||||
+{
|
||||
+ HSTRING className, contractName;
|
||||
+ HSTRING_HEADER classNameHeader, contractNameHeader;
|
||||
+ boolean isSupported = false;
|
||||
+
|
||||
+ const wchar_t *str = static_cast<const wchar_t *>(RuntimeClass_Windows_Foundation_Metadata_ApiInformation);
|
||||
+ unsigned int length;
|
||||
+ SizeTToUInt32(::wcslen(str), &length);
|
||||
+ HRESULT hr = WindowsCreateStringReference(RuntimeClass_Windows_Foundation_Metadata_ApiInformation, length, &classNameHeader, &className);
|
||||
+
|
||||
+ if (FAILED(hr))
|
||||
+ {
|
||||
+ return isSupported;
|
||||
+ }
|
||||
+
|
||||
+ Microsoft::WRL::ComPtr<ABI::Windows::Foundation::Metadata::IApiInformationStatics> api;
|
||||
+
|
||||
+ hr = RoGetActivationFactory(className, __uuidof(ABI::Windows::Foundation::Metadata::IApiInformationStatics), &api);
|
||||
+
|
||||
+ if (FAILED(hr))
|
||||
+ {
|
||||
+ return isSupported;
|
||||
+ }
|
||||
+
|
||||
+ str = static_cast<const wchar_t *>(L"Windows.Foundation.UniversalApiContract");
|
||||
+ SizeTToUInt32(::wcslen(str), &length);
|
||||
+ hr = WindowsCreateStringReference(L"Windows.Foundation.UniversalApiContract", length, &contractNameHeader,
|
||||
+ &contractName);
|
||||
+
|
||||
+ if (FAILED(hr))
|
||||
+ {
|
||||
+ return isSupported;
|
||||
+ }
|
||||
+
|
||||
+ api->IsApiContractPresentByMajor(contractName, 6, &isSupported);
|
||||
+
|
||||
+ return isSupported;
|
||||
+}
|
||||
|
||||
} // namespace rx
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
|
||||
index eac5b21..b9ee344 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/NativeWindow11WinRT.h
|
||||
@@ -34,11 +34,14 @@ class NativeWindow11WinRT : public NativeWindow11
|
||||
DXGI_FORMAT format,
|
||||
UINT width,
|
||||
UINT height,
|
||||
+ UINT samples,
|
||||
IDXGISwapChain **swapChain) override;
|
||||
|
||||
void commitChange() override;
|
||||
|
||||
static bool IsValidNativeWindow(EGLNativeWindowType window);
|
||||
+ static bool IsSupportedWin10Release();
|
||||
+
|
||||
|
||||
private:
|
||||
bool mHasAlpha;
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
|
||||
index af0beb6..20fd632 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.cpp
|
||||
@@ -246,6 +246,7 @@ HRESULT SwapChainPanelNativeWindow::createSwapChain(ID3D11Device *device,
|
||||
DXGI_FORMAT format,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
+ unsigned int samples,
|
||||
bool containsAlpha,
|
||||
IDXGISwapChain1 **swapChain)
|
||||
{
|
||||
diff --git a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
|
||||
index 09642ee..fc69bf4 100644
|
||||
--- a/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
|
||||
+++ b/src/libANGLE/renderer/d3d/d3d11/winrt/SwapChainPanelNativeWindow.h
|
||||
@@ -27,6 +27,7 @@ class SwapChainPanelNativeWindow : public InspectableNativeWindow,
|
||||
DXGI_FORMAT format,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
+ unsigned int samples,
|
||||
bool containsAlpha,
|
||||
IDXGISwapChain1 **swapChain) override;
|
||||
|
||||
@@ -43,7 +44,7 @@ class SwapChainPanelNativeWindow : public InspectableNativeWindow,
|
||||
ComPtr<IDXGISwapChain1> mSwapChain;
|
||||
};
|
||||
|
||||
-[uuid(8ACBD974 - 8187 - 4508 - AD80 - AEC77F93CF36)] class SwapChainPanelSizeChangedHandler
|
||||
+[uuid(8ACBD974-8187-4508-AD80-AEC77F93CF36)] class SwapChainPanelSizeChangedHandler
|
||||
: public Microsoft::WRL::RuntimeClass<
|
||||
Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
|
||||
ABI::Windows::UI::Xaml::ISizeChangedEventHandler>
|
||||
|
@ -30,6 +30,7 @@ set(CMAKE_STATIC_LIBRARY_PREFIX "")
|
||||
add_definitions(
|
||||
-D_CRT_SECURE_NO_DEPRECATE
|
||||
-D_SCL_SECURE_NO_WARNINGS
|
||||
-DGL_SILENCE_DEPRECATION
|
||||
-D_HAS_EXCEPTIONS=0
|
||||
-DNOMINMAX
|
||||
-DANGLE_STANDALONE_BUILD
|
||||
@ -42,11 +43,11 @@ include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include)
|
||||
##########
|
||||
# angle::common
|
||||
if(WIN32)
|
||||
set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac|_posix|android_")
|
||||
set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac|_posix")
|
||||
elseif(LINUX)
|
||||
set(ANGLE_COMMON_PLATFORM_FILTER "_win|_mac|android_")
|
||||
set(ANGLE_COMMON_PLATFORM_FILTER "_win|_mac")
|
||||
elseif(APPLE)
|
||||
set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|android_")
|
||||
set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win")
|
||||
endif()
|
||||
file(GLOB ANGLE_COMMON_SOURCES
|
||||
"src/common/*.h"
|
||||
@ -222,8 +223,12 @@ if(WIN32)
|
||||
set(LIBANGLE_SOURCES_PLATFORM
|
||||
"src/third_party/systeminfo/SystemInfo.cpp"
|
||||
)
|
||||
elseif(APPLE)
|
||||
file(GLOB LIBANGLE_SOURCES_PLATFORM
|
||||
"src/libANGLE/renderer/*.mm"
|
||||
)
|
||||
else()
|
||||
set(LIBANGLE_SOURCES_PLATFORM )
|
||||
set(LIBANGLE_SOURCES_PLATFORM)
|
||||
endif()
|
||||
|
||||
file(GLOB LIBANGLE_SOURCES
|
||||
@ -294,7 +299,35 @@ add_library(angle::libANGLE ALIAS libANGLE)
|
||||
|
||||
##########
|
||||
# libGLESv2
|
||||
file(GLOB LIBGLESV2_SOURCES "src/libGLESv2/*.h" "src/libGLESv2/*.cpp" "src/libGLESv2/libGLESv2_autogen.def")
|
||||
# Modified according to the file src/libGLESv2.gni
|
||||
list(APPEND LIBGLESV2_SOURCES
|
||||
"src/common/angleutils.h"
|
||||
"src/common/debug.h"
|
||||
"src/libANGLE/entry_points_enum_autogen.h"
|
||||
"src/libANGLE/entry_points_utils.h"
|
||||
"src/libGLESv2/entry_points_egl.cpp"
|
||||
"src/libGLESv2/entry_points_egl.h"
|
||||
"src/libGLESv2/entry_points_egl_ext.cpp"
|
||||
"src/libGLESv2/entry_points_egl_ext.h"
|
||||
"src/libGLESv2/entry_points_gles_1_0_autogen.cpp"
|
||||
"src/libGLESv2/entry_points_gles_1_0_autogen.h"
|
||||
"src/libGLESv2/entry_points_gles_2_0_autogen.cpp"
|
||||
"src/libGLESv2/entry_points_gles_2_0_autogen.h"
|
||||
"src/libGLESv2/entry_points_gles_3_0_autogen.cpp"
|
||||
"src/libGLESv2/entry_points_gles_3_0_autogen.h"
|
||||
"src/libGLESv2/entry_points_gles_3_1_autogen.cpp"
|
||||
"src/libGLESv2/entry_points_gles_3_1_autogen.h"
|
||||
"src/libGLESv2/entry_points_gles_ext_autogen.cpp"
|
||||
"src/libGLESv2/entry_points_gles_ext_autogen.h"
|
||||
"src/libGLESv2/global_state.cpp"
|
||||
"src/libGLESv2/global_state.h"
|
||||
"src/libGLESv2/libGLESv2_autogen.cpp"
|
||||
"src/libGLESv2/libGLESv2.rc"
|
||||
"src/libGLESv2/proc_table_egl.h"
|
||||
"src/libGLESv2/proc_table_egl_autogen.cpp"
|
||||
"src/libGLESv2/resource.h"
|
||||
"src/libGLESv2/libGLESv2_autogen.def"
|
||||
)
|
||||
add_library(libGLESv2 ${LIBGLESV2_SOURCES})
|
||||
target_link_libraries(libGLESv2 PRIVATE angle::common angle::libANGLE)
|
||||
target_compile_definitions(libGLESv2
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: angle
|
||||
Version: 2019-06-13
|
||||
Version: 2019-07-19-2
|
||||
Homepage: https://github.com/google/angle
|
||||
Description: A conformant OpenGL ES implementation for Windows, Mac and Linux.
|
||||
The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support.
|
||||
|
@ -2,6 +2,10 @@ include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
||||
|
||||
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
message(WARNING "Building with a gcc version less than 6.1 is not supported.")
|
||||
endif()
|
||||
|
||||
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
||||
set(ANGLE_CPU_BITNESS ANGLE_IS_32_BIT_CPU)
|
||||
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
||||
@ -15,8 +19,8 @@ endif()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO google/angle
|
||||
REF 0d3cf7085c8e953e78d4fa0656b26ee93d005452
|
||||
SHA512 91550749933e278a72ae1094178ea28b36ee2b2fa553549477596ee772d1a39653386b3f3a9f168b0840a1511b7d31384b4e2d53cd5b5629028ca9c5a18a9288
|
||||
REF 8f08fed925c54835c4faee4d7dd61d6ed2964ffd
|
||||
SHA512 037ebe356371924088563180c4a37a31eaffa41ca21c42554391672c28e62fabc19d787516b88baa192b771e05c370c5a6cfec0863b70e08d65216f41d89923f
|
||||
PATCHES
|
||||
001-fix-uwp.patch
|
||||
)
|
||||
|
0
ports/antlr4/portfile.cmake
Executable file → Normal file
0
ports/antlr4/portfile.cmake
Executable file → Normal file
@ -1,4 +1,4 @@
|
||||
Source: anyrpc
|
||||
Version: 2017-12-01
|
||||
Version: 2017-12-01-1
|
||||
Homepage: https://github.com/sgieseking/anyrpc
|
||||
Description: A multiprotocol remote procedure call system for C++.
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: apr-util
|
||||
Version: 1.6.0-3
|
||||
Version: 1.6.0-5
|
||||
Homepage: https://apr.apache.org/
|
||||
Description: Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation
|
||||
Build-Depends: expat, apr, openssl
|
||||
|
@ -3,11 +3,11 @@ index 69e45541..19b86129 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -35,7 +35,7 @@ IF(NOT EXISTS "${APR_INCLUDE_DIR}/apr.h")
|
||||
MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
|
||||
ENDIF()
|
||||
FOREACH(onelib ${APR_LIBRARIES})
|
||||
- IF(NOT EXISTS ${onelib})
|
||||
+ IF(${onelib} MATCHES "NOTFOUND")
|
||||
MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.")
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
MESSAGE(FATAL_ERROR "APR include directory ${APR_INCLUDE_DIR} is not correct.")
|
||||
ENDIF()
|
||||
FOREACH(onelib ${APR_LIBRARIES})
|
||||
- IF(NOT EXISTS ${onelib})
|
||||
+ IF(${onelib} MATCHES "NOTFOUND")
|
||||
MESSAGE(FATAL_ERROR "APR library ${onelib} was not found.")
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
|
@ -1,37 +1,39 @@
|
||||
include(vcpkg_common_functions)
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-util-1.6.0)
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://archive.apache.org/dist/apr/apr-util-1.6.0-win32-src.zip"
|
||||
FILENAME "apr-util-1.6.0-win32-src.zip"
|
||||
SHA512 98679ea181d3132020713481703bbefa0c174e0b2a0df65dfdd176e9771935e1f9455c4242bac19dded9414abe2b9d293fcc674ab16f96d8987bcf26346fce3a
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PATCHES
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
use-vcpkg-expat.patch
|
||||
apr.patch
|
||||
)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS -DAPU_DECLARE_EXPORT=ON
|
||||
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
|
||||
)
|
||||
set(APU_DECLARE_EXPORT ON)
|
||||
set(APU_DECLARE_STATIC OFF)
|
||||
else()
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS -DAPU_DECLARE_STATIC=ON
|
||||
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
|
||||
)
|
||||
set(APU_DECLARE_EXPORT OFF)
|
||||
set(APU_DECLARE_STATIC ON)
|
||||
endif()
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-DAPU_DECLARE_EXPORT=${APU_DECLARE_EXPORT}
|
||||
-DAPU_DECLARE_STATIC=${APU_DECLARE_STATIC}
|
||||
OPTIONS_DEBUG
|
||||
-DDISABLE_INSTALL_HEADERS=ON
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(READ ${CURRENT_PACKAGES_DIR}/include/apu.h APU_H)
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
@ -41,7 +43,4 @@ else()
|
||||
endif()
|
||||
file(WRITE ${CURRENT_PACKAGES_DIR}/include/apu.h "${APU_H}")
|
||||
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/apr-util RENAME copyright)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: apr
|
||||
Version: 1.6.5-2
|
||||
Version: 1.6.5-3
|
||||
Homepage: https://apr.apache.org/
|
||||
Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
|
||||
|
||||
|
@ -6,13 +6,16 @@ include(vcpkg_common_functions)
|
||||
|
||||
set(VERSION 1.6.5)
|
||||
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/apr-${VERSION})
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://www.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
|
||||
FILENAME "apr-${VERSION}.tar.bz2"
|
||||
SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
)
|
||||
|
||||
if("private-headers" IN_LIST FEATURES)
|
||||
set(INSTALL_PRIVATE_H ON)
|
||||
|
@ -1,3 +1,3 @@
|
||||
Source: argtable2
|
||||
Version: 2.13-2
|
||||
Description: Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.
|
||||
Source: argtable2
|
||||
Version: 2.13-4
|
||||
Description: Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.
|
||||
|
@ -1,24 +1,24 @@
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 3427487..a9b8be0 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -1,5 +1,4 @@
|
||||
-# for now, install in subdirectory of source directory by default
|
||||
-SET( CMAKE_INSTALL_PREFIX .. )
|
||||
+include(GNUInstallDirs)
|
||||
|
||||
IF( WIN32 )
|
||||
ADD_LIBRARY( argtable2 arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
|
||||
@@ -7,5 +6,9 @@ ELSE( WIN32 )
|
||||
ADD_LIBRARY( argtable2 arg_date.c arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_rex.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
|
||||
ENDIF( WIN32 )
|
||||
|
||||
-INSTALL( TARGETS argtable2 ARCHIVE DESTINATION lib)
|
||||
-SET_TARGET_PROPERTIES( argtable2 PROPERTIES DEBUG_POSTFIX d )
|
||||
\ No newline at end of file
|
||||
+INSTALL(TARGETS argtable2
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+)
|
||||
+INSTALL(FILES argtable2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 3427487..a9b8be0 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -1,5 +1,4 @@
|
||||
-# for now, install in subdirectory of source directory by default
|
||||
-SET( CMAKE_INSTALL_PREFIX .. )
|
||||
+include(GNUInstallDirs)
|
||||
|
||||
IF( WIN32 )
|
||||
ADD_LIBRARY( argtable2 arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
|
||||
@@ -7,5 +6,9 @@ ELSE( WIN32 )
|
||||
ADD_LIBRARY( argtable2 arg_date.c arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_rex.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c )
|
||||
ENDIF( WIN32 )
|
||||
|
||||
-INSTALL( TARGETS argtable2 ARCHIVE DESTINATION lib)
|
||||
-SET_TARGET_PROPERTIES( argtable2 PROPERTIES DEBUG_POSTFIX d )
|
||||
\ No newline at end of file
|
||||
+INSTALL(TARGETS argtable2
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+)
|
||||
+INSTALL(FILES argtable2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
|
@ -1,33 +1,30 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/argtable2-13)
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://prdownloads.sourceforge.net/argtable/argtable2-13.tar.gz"
|
||||
FILENAME "argtable-2.13.zip"
|
||||
SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-install-dirs.patch"
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-DCMAKE_DEBUG_POSTFIX=d
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
# Remove duplicate include installs
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/argtable2 RENAME copyright)
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://prdownloads.sourceforge.net/argtable/argtable2-13.tar.gz"
|
||||
FILENAME "argtable-2.13.zip"
|
||||
SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
fix-install-dirs.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-DCMAKE_DEBUG_POSTFIX=d
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
@ -1,4 +1,4 @@
|
||||
Source: armadillo
|
||||
Version: 2019-04-16-5
|
||||
Version: 2019-04-16-6
|
||||
Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use
|
||||
Build-Depends: openblas (!osx), clapack (!osx)
|
||||
|
@ -27,7 +27,7 @@ vcpkg_configure_cmake(
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH share/Armadillo/CMake)
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH share/Armadillo/CMake TARGET_PATH share/Armadillo)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
@ -41,5 +41,5 @@ if(SHARE_LEN EQUAL 0)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Armadillo)
|
||||
endif()
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/armadillo)
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/armadillo RENAME copyright)
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: arrow
|
||||
Version: 0.14.1
|
||||
Version: 0.14.1-1
|
||||
Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags, thrift, double-conversion, glog, uriparser
|
||||
Homepage: https://github.com/apache/arrow
|
||||
Description: Apache Arrow is a columnar in-memory analytics layer designed to accelerate big data. It houses a set of canonical in-memory representations of flat and hierarchical data along with multiple language-bindings for structure manipulation. It also provides IPC and common algorithm implementations.
|
||||
|
31
ports/arrow/fix-msvc-1900.patch
Normal file
31
ports/arrow/fix-msvc-1900.patch
Normal file
@ -0,0 +1,31 @@
|
||||
diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake
|
||||
index 496904b..887f9c4 100644
|
||||
--- a/cpp/cmake_modules/SetupCxxFlags.cmake
|
||||
+++ b/cpp/cmake_modules/SetupCxxFlags.cmake
|
||||
@@ -124,7 +124,9 @@ macro(arrow_add_werror_if_debug)
|
||||
if("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
|
||||
# Treat all compiler warnings as errors
|
||||
if("${COMPILER_FAMILY}" STREQUAL "msvc")
|
||||
- set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /WX")
|
||||
+ if (MSVC_VERSION VERSION_LESS 1900)
|
||||
+ set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} /WX")
|
||||
+ endif()
|
||||
else()
|
||||
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Werror")
|
||||
endif()
|
||||
diff --git a/cpp/src/parquet/schema.h b/cpp/src/parquet/schema.h
|
||||
index 740edbc..1526c73 100644
|
||||
--- a/cpp/src/parquet/schema.h
|
||||
+++ b/cpp/src/parquet/schema.h
|
||||
@@ -457,7 +457,11 @@ class PARQUET_EXPORT SchemaDescriptor {
|
||||
// -- -- b |
|
||||
// -- -- -- c |
|
||||
// -- -- -- -- d
|
||||
+#if _MSC_VER >= 1900
|
||||
+ std::unordered_map<int, schema::NodePtr> leaf_to_base_;
|
||||
+#else
|
||||
std::unordered_map<int, const schema::NodePtr> leaf_to_base_;
|
||||
+#endif
|
||||
|
||||
// Mapping between ColumnPath DotString to the leaf index
|
||||
std::unordered_multimap<std::string, int> leaf_to_idx_;
|
@ -12,6 +12,7 @@ vcpkg_from_github(
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
all.patch
|
||||
fix-msvc-1900.patch
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED)
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: assimp
|
||||
Version: 4.1.0-8
|
||||
Version: 5.0.0
|
||||
Homepage: https://github.com/assimp/assimp
|
||||
Description: The Open Asset import library
|
||||
Build-Depends: zlib, rapidjson
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d781d1f..0d64d50 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -92,7 +92,6 @@ if (WIN32)
|
||||
endif()
|
||||
|
||||
IF(MSVC)
|
||||
- set (CMAKE_PREFIX_PATH "D:\\libs\\devil")
|
||||
OPTION( ASSIMP_INSTALL_PDB
|
||||
"Install MSVC debug files."
|
||||
ON
|
13
ports/assimp/fix-static-build-error.patch
Normal file
13
ports/assimp/fix-static-build-error.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index dcafb64..6c3d03e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -253,7 +253,7 @@ ELSEIF(MSVC)
|
||||
IF(MSVC12)
|
||||
ADD_COMPILE_OPTIONS(/wd4351)
|
||||
ENDIF()
|
||||
- SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob2 /DEBUG:FULL /Zi")
|
||||
+# SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob2 /DEBUG:FULL /Zi")
|
||||
ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
|
||||
IF(NOT HUNTER_ENABLED)
|
||||
SET(CMAKE_CXX_FLAGS "-fPIC -std=c++11 ${CMAKE_CXX_FLAGS}")
|
@ -3,13 +3,12 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO assimp/assimp
|
||||
REF v4.1.0
|
||||
SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
|
||||
REF v5.0.0
|
||||
SHA512 0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
dont-overwrite-prefix-path.patch
|
||||
uninitialized-variable.patch
|
||||
remove-useless-path.patch
|
||||
fix-static-build-error.patch
|
||||
)
|
||||
|
||||
file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake)
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4a20cee..4fcb8dd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -108,7 +108,6 @@ if (WIN32)
|
||||
endif()
|
||||
|
||||
IF(MSVC)
|
||||
- SET (CMAKE_PREFIX_PATH "D:\\libs\\devil")
|
||||
OPTION( ASSIMP_INSTALL_PDB
|
||||
"Install MSVC debug files."
|
||||
ON
|
@ -1,13 +1,13 @@
|
||||
diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h
|
||||
index 916fb1f..a7bc178 100644
|
||||
--- a/contrib/zip/src/miniz.h
|
||||
+++ b/contrib/zip/src/miniz.h
|
||||
@@ -4420,7 +4420,7 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name
|
||||
#ifndef MINIZ_NO_STDIO
|
||||
mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags)
|
||||
{
|
||||
- mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes;
|
||||
+ mz_uint uncomp_crc32 = MZ_CRC32_INIT, level = 0, num_alignment_padding_bytes;
|
||||
mz_uint16 method = 0, dos_time = 0, dos_date = 0, ext_attributes = 0;
|
||||
mz_uint64 local_dir_header_ofs, cur_archive_file_ofs, uncomp_size = 0, comp_size = 0;
|
||||
size_t archive_name_size;
|
||||
diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h
|
||||
index 2c27a94..8390dfd 100644
|
||||
--- a/contrib/zip/src/miniz.h
|
||||
+++ b/contrib/zip/src/miniz.h
|
||||
@@ -5944,7 +5944,7 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
|
||||
const char *pSrc_filename, const void *pComment,
|
||||
mz_uint16 comment_size, mz_uint level_and_flags,
|
||||
mz_uint32 ext_attributes) {
|
||||
- mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes;
|
||||
+ mz_uint uncomp_crc32 = MZ_CRC32_INIT, level=0, num_alignment_padding_bytes;
|
||||
mz_uint16 method = 0, dos_time = 0, dos_date = 0;
|
||||
time_t file_modified_time;
|
||||
mz_uint64 local_dir_header_ofs, cur_archive_file_ofs, uncomp_size = 0,
|
||||
|
@ -1,4 +1,4 @@
|
||||
Source: asynch
|
||||
Version: 2019-09-21
|
||||
Version: 2019-09-21-1
|
||||
Homepage: https://github.com/naasking/async.h
|
||||
Description: Async.h - asynchronous, stackless subroutines.
|
@ -12,4 +12,4 @@ vcpkg_from_github(
|
||||
file(COPY ${SOURCE_PATH}/async/async.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
@ -1,5 +1,5 @@
|
||||
Source: atk
|
||||
Version: 2.24.0-4
|
||||
Homepage: https://developer.gnome.org/atk/
|
||||
Description: GNOME Accessibility Toolkit
|
||||
Build-Depends: glib, gettext
|
||||
Source: atk
|
||||
Version: 2.24.0-5
|
||||
Homepage: https://developer.gnome.org/atk/
|
||||
Description: GNOME Accessibility Toolkit
|
||||
Build-Depends: glib, gettext
|
||||
|
@ -1,13 +0,0 @@
|
||||
diff --git a/atk/atkversion.h b/atk/atkversion.h
|
||||
index 2634b0a..7bea2f3 100644
|
||||
--- a/atk/atkversion.h
|
||||
+++ b/atk/atkversion.h
|
||||
@@ -3,7 +3,7 @@
|
||||
* Copyright (C) 2012 Igalia, S.L.
|
||||
* Copyright (C) 2014 Chun-wei Fan
|
||||
*
|
||||
- * Author: Alejandro Pi?eiro Iglesias <apinheiro@igalia.com>
|
||||
+ * Author: Alejandro Pineiro Iglesias <apinheiro@igalia.com>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
@ -3,17 +3,17 @@ include(vcpkg_common_functions)
|
||||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
|
||||
|
||||
set(ATK_VERSION 2.24.0)
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/atk-${ATK_VERSION})
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz"
|
||||
FILENAME "atk-${ATK_VERSION}.tar.xz"
|
||||
SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962)
|
||||
SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
ARCHIVE ${ARCHIVE}
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
fix-encoding.patch
|
||||
fix-linux-config.patch
|
||||
)
|
||||
|
||||
@ -32,5 +32,4 @@ vcpkg_configure_cmake(
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/atk)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/atk/COPYING ${CURRENT_PACKAGES_DIR}/share/atk/copyright)
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: atkmm
|
||||
Version: 2.24.2-1
|
||||
Version: 2.24.2-2
|
||||
Homepage: https://www.gtkmm.org
|
||||
Description: atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.
|
||||
Build-Depends: glib, gettext, atk, glibmm
|
||||
|
@ -1,2 +0,0 @@
|
||||
atkmm is the C++ binding for the ATK library.
|
||||
This module is part of the GNOME C++ bindings effort <http://www.gtkmm.org/>.
|
@ -2,17 +2,18 @@ include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
|
||||
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/atkmm-2.24.2)
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz"
|
||||
FILENAME "atkmm-2.24.2.tar.xz"
|
||||
SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix_properties.patch ${CMAKE_CURRENT_LIST_DIR}/fix_charset.patch
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
PATCHES
|
||||
fix_properties.patch
|
||||
fix_charset.patch
|
||||
)
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013)
|
||||
@ -62,6 +63,4 @@ file(
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
# Handle copyright and readme
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/atkmm RENAME copyright)
|
||||
file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/atkmm RENAME readme.txt)
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: aubio
|
||||
Version: 0.4.9
|
||||
Version: 0.4.9-1
|
||||
Homepage: https://github.com/aubio/aubio
|
||||
Description: Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.
|
||||
Build-Depends: ffmpeg, libsndfile, libogg, libflac, libvorbis, bzip2, liblzma
|
||||
|
@ -2,7 +2,6 @@ include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aubio-3c230fae309e9ea3298783368dd71bae6172359a)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO aubio/aubio
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: avro-c
|
||||
Version: 1.8.2-2
|
||||
Version: 1.8.2-3
|
||||
Homepage: https://github.com/apache/avro
|
||||
Description: Apache Avro is a data serialization system
|
||||
Build-Depends: jansson, liblzma, zlib
|
||||
|
@ -1,11 +1,6 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
|
||||
if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
|
||||
message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n"
|
||||
"We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
|
||||
)
|
||||
endif()
|
||||
vcpkg_buildpath_length_warning(37)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: aws-sdk-cpp
|
||||
Version: 1.7.142
|
||||
Version: 1.7.142-1
|
||||
Homepage: https://github.com/aws/aws-sdk-cpp
|
||||
Description: AWS SDK for C++
|
||||
Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows), aws-c-event-stream
|
||||
|
@ -1,11 +1,6 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
|
||||
if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
|
||||
message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n"
|
||||
"We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
|
||||
)
|
||||
endif()
|
||||
vcpkg_buildpath_length_warning(37)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: azure-c-shared-utility
|
||||
Version: 2019-08-20.1
|
||||
Version: 2019-10-07.1-1
|
||||
Description: Azure C SDKs common code
|
||||
Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c
|
||||
|
||||
|
@ -1,13 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 190ea87..a434cee 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -264,7 +264,7 @@ if(${use_applessl})
|
||||
include_directories(./pal/ios-osx/)
|
||||
endif()
|
||||
|
||||
-if (WIN32 AND (${CMAKE_SYSTEM_VERSION} VERSION_EQUAL "10.0.17763.0" OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.0.17763.0"))
|
||||
+if (WIN32 AND (CMAKE_SYSTEM_VERSION VERSION_EQUAL "10.0.17763.0" OR CMAKE_SYSTEM_VERSION VERSION_GREATER "10.0.17763.0"))
|
||||
# Windows added support for UNIX domain sockets to the OS and SDK
|
||||
# in the Oct 2018 update (10.0.17763.0, aka RS5)
|
||||
add_definitions(-DAF_UNIX_ON_WINDOWS)
|
@ -6,19 +6,17 @@ if("public-preview" IN_LIST FEATURES)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-c-shared-utility
|
||||
REF 1f3fd807c8c47b6607d349469301afb64643aa89
|
||||
SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2
|
||||
REF 42574842914591aadc77701aac72f18cc72319ad
|
||||
SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789
|
||||
HEAD_REF master
|
||||
PATCHES no-double-expand-cmake.patch
|
||||
)
|
||||
else()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-c-shared-utility
|
||||
REF 1f3fd807c8c47b6607d349469301afb64643aa89
|
||||
SHA512 312ef2668ad62cb676c51474ba08307bacf9843d661233f7a6145e565ae58dcecb7bfa2e8a157efef1b54e8c07621bf2ec47b4d76ea180d77767b1ad44b951c2
|
||||
REF 42574842914591aadc77701aac72f18cc72319ad
|
||||
SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789
|
||||
HEAD_REF master
|
||||
PATCHES no-double-expand-cmake.patch
|
||||
)
|
||||
endif()
|
||||
|
||||
@ -43,4 +41,3 @@ file(COPY ${SOURCE_PATH}/configs/azure_iot_build_rules.cmake DESTINATION ${CURRE
|
||||
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-c-shared-utility/copyright COPYONLY)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: azure-iot-sdk-c
|
||||
Version: 2019-08-20.1
|
||||
Version: 2019-10-07.1
|
||||
Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c
|
||||
Description: A C99 SDK for connecting devices to Microsoft Azure IoT services
|
||||
|
||||
|
@ -6,8 +6,8 @@ if("public-preview" IN_LIST FEATURES)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-iot-sdk-c
|
||||
REF 8b7cc18456f377b7f0df42dcdefb24ae81d9e7fc
|
||||
SHA512 0386889fc3d32a795998a35a382cce6d11f6712416f3a1a49de6ea7d9c0c973ca05989353ee9a3ec5ca02dc55c2b59dc803cbf4866b918274667e52d03d1490f
|
||||
REF d1cdf78b5160af8e08354e102a6b96395eee79e1
|
||||
SHA512 0efbfc19e5eef4831b55ded0e8d88e83194bc0f26886841ddc83405c15b7f1bae983e22dc569e22846acd78b843b9e7492883b7c502f4eed92ff80ef45a9942d
|
||||
HEAD_REF public-preview
|
||||
PATCHES improve-external-deps.patch cmake-hsm-option.patch
|
||||
)
|
||||
@ -15,8 +15,8 @@ else()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-iot-sdk-c
|
||||
REF b03cc5e0afb647934e45d4530d3e993476db3d3e
|
||||
SHA512 7428c625dbacfd9ab612d5bbfad3c079074cd3834fe84a42db88e747aab2615140c0ca3035adc36b29ed8cf4bf487360522215ce03cee3e26254af925a68384a
|
||||
REF f8d260df190f90c04114ca8ff7d83dd03d4dd80d
|
||||
SHA512 111331293cfbdbdac4a6460d293ec8650bee31940829852c27afc88cc6e742e96f71c996aa275dc5ed1f13e9fe19452d7b2685dde47bb7d6c135ebee58c50d21
|
||||
HEAD_REF master
|
||||
PATCHES improve-external-deps.patch
|
||||
)
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: azure-macro-utils-c
|
||||
Version: 2019-08-20.1
|
||||
Version: 2019-10-07.1
|
||||
Description: A library of macros for the Azure IoT SDK Suite
|
||||
Build-Depends:
|
||||
|
||||
|
@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-macro-utils-c
|
||||
REF 17a6ad1df91e57d6981366710096798bcb5991a6
|
||||
SHA512 8f5b9561ff303832834113098a3c9eeace1f1fbbc55e508c50d0f75bfe08ee05b54a8d6a0786148c5e7861a0149317a2cc113022626f8ac72df732bda9162855
|
||||
REF 7523af934fc4d9423111e358f49b19314ec9c3e3
|
||||
SHA512 b53765096654fff9c5670004e4e107bffa81dd07e63eeac687c9e2b7e5ea2e1f26b6ae025c05c45f5c28152a457922f08c7f8d3303fa4d3b9194c34ba59533d5
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: azure-storage-cpp
|
||||
Version: 6.1.0-2
|
||||
Version: 7.0.0
|
||||
Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext
|
||||
Description: Microsoft Azure Storage Client SDK for C++
|
||||
A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client.
|
||||
|
@ -1,40 +0,0 @@
|
||||
diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
|
||||
index 9171f8c..b2c7b93 100644
|
||||
--- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
|
||||
+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindUUID.cmake
|
||||
@@ -13,6 +13,11 @@
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
#
|
||||
|
||||
+if (APPLE)
|
||||
+ set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/)
|
||||
+ set(CMAKE_OSX_FRAMEWORK_HEADERS ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Headers)
|
||||
+ set(UUID_LIBRARY "")
|
||||
+endif()
|
||||
|
||||
if (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
|
||||
# in cache already
|
||||
@@ -39,6 +44,7 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
|
||||
/opt/include
|
||||
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
|
||||
/usr/freeware/include
|
||||
+ ${CMAKE_OSX_FRAMEWORK_HEADERS}
|
||||
)
|
||||
|
||||
find_library(UUID_LIBRARY
|
||||
@@ -88,13 +94,13 @@ else (UUID_LIBRARIES AND UUID_INCLUDE_DIRS)
|
||||
set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR})
|
||||
set(UUID_LIBRARIES ${UUID_LIBRARY})
|
||||
|
||||
- if (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
|
||||
+ if (UUID_INCLUDE_DIRS AND (UUID_LIBRARIES OR APPLE))
|
||||
set(UUID_FOUND TRUE)
|
||||
endif (UUID_INCLUDE_DIRS AND UUID_LIBRARIES)
|
||||
|
||||
if (UUID_FOUND)
|
||||
if (NOT UUID_FIND_QUIETLY)
|
||||
- message(STATUS "Found UUID : ${UUID_LIBRARIES}")
|
||||
+ message(STATUS "Found UUID : ${UUID_INCLUDE_DIRS} ${UUID_LIBRARIES}")
|
||||
endif (NOT UUID_FIND_QUIETLY)
|
||||
else (UUID_FOUND)
|
||||
if (UUID_FIND_REQUIRED)
|
@ -7,12 +7,10 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-storage-cpp
|
||||
REF v6.1.0
|
||||
SHA512 bc6a1da6287301b5bb5c31694d508c46447b71043d5b94a90ffe79b6dc045bc111ed0bcf3a7840e096ddc3ef6badbeef7fb905242e272a9f82f483d849a43e61
|
||||
REF v7.0.0
|
||||
SHA512 2187bd4d640ff1630f4f20d2717ea0219f7835e524b1db5b89563b5b525a34200a33693030d9e004db9cfe1df905b6c76ffd709f9e6cb2e2861ba1c1f8d062db
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
# on osx use the uuid.h that is part of the osx sdk
|
||||
builtin-uuid-osx.patch
|
||||
remove-gcov-dependency.patch
|
||||
)
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: azure-uamqp-c
|
||||
Version: 2019-08-20.1
|
||||
Version: 2019-10-07.1
|
||||
Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
|
||||
Description: AMQP library for C
|
||||
|
||||
|
@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-uamqp-c
|
||||
REF 6922680bda8581e8c8df34a764d32e62a8498943
|
||||
SHA512 1ba060efc2330967aae53b43879c7566f90ec539f28cc6e7054852235c916ad9254628415b79ff25e4191302911673ec501d97c6707e8f65a5583f687a64b2aa
|
||||
REF 065ffdeeb47313ddbbc2a8e84ad52ab033e2e8d2
|
||||
SHA512 bade6fae2d5479b7690632dbcc58bda5dd871eb0aa63d6a56cb35e81630121b5148309cd3414e6339c1218ec59fc12ac318b4964d295b579f7a0cacf5593b7ba
|
||||
HEAD_REF master
|
||||
)
|
||||
else()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-uamqp-c
|
||||
REF 6922680bda8581e8c8df34a764d32e62a8498943
|
||||
SHA512 1ba060efc2330967aae53b43879c7566f90ec539f28cc6e7054852235c916ad9254628415b79ff25e4191302911673ec501d97c6707e8f65a5583f687a64b2aa
|
||||
REF 065ffdeeb47313ddbbc2a8e84ad52ab033e2e8d2
|
||||
SHA512 bade6fae2d5479b7690632dbcc58bda5dd871eb0aa63d6a56cb35e81630121b5148309cd3414e6339c1218ec59fc12ac318b4964d295b579f7a0cacf5593b7ba
|
||||
HEAD_REF master
|
||||
)
|
||||
endif()
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: azure-uhttp-c
|
||||
Version: 2019-08-20.1
|
||||
Version: 2019-10-07.1
|
||||
Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
|
||||
Description: Azure HTTP Library written in C
|
||||
|
||||
|
@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-uhttp-c
|
||||
REF 15fba15a8247746d6131aeefbcd394bdea202fc0
|
||||
SHA512 f7f93d2041407b353cd407d8487469a2e7131911b826b7fd4598025432cc0625124a935ca6346d6db2fe2149747cdb3a8b19040dc7f90e1a196c020a85f454f4
|
||||
REF d84a20609a2b5a555920389451fb3c9a2ed3656c
|
||||
SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6
|
||||
HEAD_REF master
|
||||
)
|
||||
else()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-uhttp-c
|
||||
REF 15fba15a8247746d6131aeefbcd394bdea202fc0
|
||||
SHA512 f7f93d2041407b353cd407d8487469a2e7131911b826b7fd4598025432cc0625124a935ca6346d6db2fe2149747cdb3a8b19040dc7f90e1a196c020a85f454f4
|
||||
REF d84a20609a2b5a555920389451fb3c9a2ed3656c
|
||||
SHA512 4eadd7e120082cc3bcf696d6cd16bc7ee8e1082380dd7583fba7fad1bb95109f3456890495e25ae7675e656ef721fa12eff22eeb96d8a4cf359be5c96889cbd6
|
||||
HEAD_REF master
|
||||
)
|
||||
endif()
|
||||
|
@ -1,5 +1,5 @@
|
||||
Source: azure-umqtt-c
|
||||
Version: 2019-08-20.1
|
||||
Version: 2019-10-07.1
|
||||
Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c
|
||||
Description: General purpose library for communication over the mqtt protocol
|
||||
|
||||
|
@ -6,16 +6,16 @@ if("public-preview" IN_LIST FEATURES)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-umqtt-c
|
||||
REF 5764c24be5db7a7c5988a5f1d63c329f68f1c8d8
|
||||
SHA512 c5a976b84a9efb0951ae60b3dc7bae9862c7eac633ced2cf252fc3133cb06f16c584f8dfd5ce74adeadc5c922742c8e8fa31813e00e80cd67c39fc1825002c64
|
||||
REF 7557db6de094b67818d3c410dc95a3cf07cd86a6
|
||||
SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40
|
||||
HEAD_REF master
|
||||
)
|
||||
else()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-umqtt-c
|
||||
REF 5764c24be5db7a7c5988a5f1d63c329f68f1c8d8
|
||||
SHA512 c5a976b84a9efb0951ae60b3dc7bae9862c7eac633ced2cf252fc3133cb06f16c584f8dfd5ce74adeadc5c922742c8e8fa31813e00e80cd67c39fc1825002c64
|
||||
REF 7557db6de094b67818d3c410dc95a3cf07cd86a6
|
||||
SHA512 f2577379f711e2576fdd6dfecbc4d8a0b26c7670a77bc468238e8dd5fa43f208db85eddd06dd570fde4219ba19304338c712f671c059c6cc10abb4892d58ae40
|
||||
HEAD_REF master
|
||||
)
|
||||
endif()
|
||||
|
@ -1,4 +1,4 @@
|
||||
Source: berkeleydb
|
||||
Version: 4.8.30-2
|
||||
Version: 4.8.30-3
|
||||
Homepage: https://download.oracle.com/
|
||||
Description: BDB - A high-performance embedded database for key/value data.
|
||||
|
@ -4,14 +4,16 @@ endif()
|
||||
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/db-4.8.30.NC)
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://download.oracle.com/berkeley-db/db-4.8.30.NC.zip"
|
||||
FILENAME "db-4.8.30.NC.zip"
|
||||
SHA512 59c1d2d5a3551f988ab1dc063900572b67ad087537e0d71760de34601f9ebd4d5c070a49b809bec4a599a62417e9a162683ce0f6442deb1a0dadb80764bf6eab
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
)
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
Source: bigint
|
||||
Version: 2010.04.30-3
|
||||
Version: 2010.04.30-4
|
||||
Homepage: https://mattmccutchen.net/bigint
|
||||
Description: C++ Big Integer Library
|
||||
|
@ -2,13 +2,16 @@ include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bigint-2010.04.30)
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://mattmccutchen.net/bigint/bigint-2010.04.30.tar.bz2"
|
||||
FILENAME "bigint-2010.04.30.tar.bz2"
|
||||
SHA512 bb64380e51991f97a2489c04801ab4372f795b5e23870ad12d71087f1a2afba9b32f74dcdbdcb5228ebf0dd74a37185285bac7653dd3c62d6118d63c298689af
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
)
|
||||
|
||||
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
|
||||
|
||||
|
0
ports/bitsery/fix-install-paths.patch
Executable file → Normal file
0
ports/bitsery/fix-install-paths.patch
Executable file → Normal file
@ -1,5 +1,5 @@
|
||||
Source: blaze
|
||||
Version: 3.6
|
||||
Version: 3.6-1
|
||||
Build-Depends: clapack (!osx), boost-exception
|
||||
Homepage: https://bitbucket.org/blaze-lib/blaze
|
||||
Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.
|
||||
|
@ -1,113 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 7ecc993..793ec34 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -63,8 +63,8 @@ endif()
|
||||
#==================================================================================================
|
||||
|
||||
find_package(LAPACK REQUIRED)
|
||||
-target_link_libraries(blaze INTERFACE ${LAPACK_LIBRARIES})
|
||||
-target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
|
||||
+target_link_libraries(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LIBRARIES}>)
|
||||
+target_compile_options(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LINKER_FLAGS}>)
|
||||
|
||||
|
||||
#==================================================================================================
|
||||
@@ -72,7 +72,7 @@ target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
|
||||
#==================================================================================================
|
||||
|
||||
find_package(Boost 1.54.0 REQUIRED)
|
||||
-target_include_directories(blaze INTERFACE ${Boost_INCLUDE_DIRS})
|
||||
+target_include_directories(blaze INTERFACE $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>)
|
||||
|
||||
|
||||
#==================================================================================================
|
||||
@@ -163,7 +163,7 @@ endif ()
|
||||
set(BLAZE_CACHE_SIZE ${BLAZE_CACHE_SIZE} CACHE STRING "Cache size of the CPU in bytes." FORCE)
|
||||
|
||||
configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/CacheSize.h.in"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/blaze/config/CacheSize.h")
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/CacheSize.h")
|
||||
|
||||
|
||||
#==================================================================================================
|
||||
@@ -216,7 +216,7 @@ else ()
|
||||
endif ()
|
||||
|
||||
configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/BLAS.h.in"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/blaze/config/BLAS.h")
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/BLAS.h")
|
||||
|
||||
|
||||
#==================================================================================================
|
||||
@@ -227,7 +227,7 @@ set(BLAZE_TRANSPOSE_FLAG "columnVector" CACHE STRING "Specify the default transp
|
||||
set_property(CACHE BLAZE_TRANSPOSE_FLAG PROPERTY STRINGS "columnVector;rowVector")
|
||||
|
||||
configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/TransposeFlag.h.in"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/blaze/config/TransposeFlag.h")
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/TransposeFlag.h")
|
||||
|
||||
|
||||
#==================================================================================================
|
||||
@@ -238,7 +238,7 @@ set(BLAZE_STORAGE_ORDER "rowMajor" CACHE STRING "Specify the default storage ord
|
||||
set_property(CACHE BLAZE_STORAGE_ORDER PROPERTY STRINGS "rowMajor;columnMajor")
|
||||
|
||||
configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/StorageOrder.h.in"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/blaze/config/StorageOrder.h")
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/StorageOrder.h")
|
||||
|
||||
|
||||
#==================================================================================================
|
||||
@@ -254,7 +254,7 @@ else ()
|
||||
endif ()
|
||||
|
||||
configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Vectorization.h.in"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Vectorization.h")
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Vectorization.h")
|
||||
|
||||
|
||||
#==================================================================================================
|
||||
@@ -300,7 +300,7 @@ elseif (BLAZE_SMP_THREADS STREQUAL "HPX")
|
||||
endif ()
|
||||
|
||||
configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/SMP.h.in"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/blaze/config/SMP.h")
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/SMP.h")
|
||||
|
||||
|
||||
#==================================================================================================
|
||||
@@ -316,7 +316,7 @@ else ()
|
||||
endif ()
|
||||
|
||||
configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Restrict.h.in"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Restrict.h")
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Restrict.h")
|
||||
|
||||
|
||||
#==================================================================================================
|
||||
@@ -346,7 +346,7 @@ else ()
|
||||
endif ()
|
||||
|
||||
configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Optimizations.h.in"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Optimizations.h")
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Optimizations.h")
|
||||
|
||||
|
||||
#==================================================================================================
|
||||
@@ -364,7 +364,7 @@ else ()
|
||||
endif ()
|
||||
|
||||
configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Inline.h.in"
|
||||
- "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Inline.h")
|
||||
+ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Inline.h")
|
||||
|
||||
|
||||
#==================================================================================================
|
||||
@@ -379,6 +379,7 @@ write_basic_package_version_file(
|
||||
COMPATIBILITY SameMajorVersion
|
||||
)
|
||||
|
||||
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/blaze DESTINATION include)
|
||||
install(DIRECTORY blaze DESTINATION include)
|
||||
install(TARGETS blaze EXPORT blazeTargets)
|
||||
|
@ -6,8 +6,6 @@ vcpkg_from_bitbucket(
|
||||
REF 51fff70fcc70c8bcb167b5daa497babf51b7603e
|
||||
SHA512 7048720d1842a0a8e621f6878c43942664523f889f2659f4334c7428d1177a5a226c95bcb5f84b93cae87c61e188bf91dc2429b1ddfc7b6a7b8eb74ab8c0a1ec
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
avoid-src-dir-generation.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
|
@ -1,6 +1,5 @@
|
||||
Source: bond
|
||||
Maintainer: bond@microsoft.com
|
||||
Version: 8.1.0-2
|
||||
Version: 8.1.0-3
|
||||
Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
|
||||
Homepage: https://github.com/Microsoft/bond
|
||||
Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
|
||||
|
@ -2,8 +2,6 @@ include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-7.0.2)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO microsoft/bond
|
||||
@ -19,7 +17,7 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR
|
||||
FILENAME "gbc-8.1.0-amd64.zip"
|
||||
SHA512 896c9a78fc714e0ea44c37ed36400ec8e5f52d495a8d81aa80834ff6cd6303c7c94e06129f7b2269416a9e0ffb61423e87406db798fb5be7ff00f14981530089
|
||||
)
|
||||
|
||||
|
||||
# Extract the precompiled gbc
|
||||
vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/)
|
||||
set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc.exe)
|
||||
@ -27,13 +25,13 @@ if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR
|
||||
if (NOT EXISTS "${FETCHED_GBC_PATH}")
|
||||
message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.")
|
||||
endif()
|
||||
|
||||
|
||||
else()
|
||||
# According to the readme on https://github.com/microsoft/bond/
|
||||
# The build needs a version of the Haskel Tool stack that is newer than some distros ship with.
|
||||
# For this reason the message is not guarded by checking to see if the tool is installed.
|
||||
message("\nA recent version of Haskell Tool Stack is required to build.\n For information on how to install see https://docs.haskellstack.org/en/stable/README/\n")
|
||||
|
||||
|
||||
endif()
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
|
||||
Source: boost-accumulators
|
||||
Version: 1.70.0
|
||||
Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-interval, boost-iterator, boost-mpl, boost-numeric-conversion, boost-odeint, boost-parameter, boost-preprocessor, boost-range, boost-static-assert, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-ublas, boost-utility, boost-vcpkg-helpers
|
||||
Version: 1.71.0
|
||||
Build-Depends: boost-array, boost-assert, boost-circular-buffer, boost-concept-check, boost-config, boost-core, boost-detail, boost-fusion, boost-interval, boost-iterator, boost-mpl, boost-numeric-conversion, boost-odeint, boost-parameter, boost-preprocessor, boost-range, boost-serialization, boost-static-assert, boost-throw-exception, boost-tuple, boost-typeof, boost-type-traits, boost-ublas, boost-utility, boost-vcpkg-helpers
|
||||
Homepage: https://github.com/boostorg/accumulators
|
||||
Description: Boost accumulators module
|
||||
|
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO boostorg/accumulators
|
||||
REF boost-1.70.0
|
||||
SHA512 5f4b80082b033f1b5a8d2fa7f69410e334632d535011fefc6792331b2d77e27904b1cc7cef5a77891cec09cd329b08589552529c8feabb6b2da9676da3fc0dff
|
||||
REF boost-1.71.0
|
||||
SHA512 72cc55074f40475b6506802ce9be0291439db30f2bbb1c826952fa258b00d3f097ac7dd6c6b1c03d721633d720ac16c213272076af7ca9d205e5544fc459c93c
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
|
||||
Source: boost-algorithm
|
||||
Version: 1.70.0
|
||||
Version: 1.71.0
|
||||
Build-Depends: boost-array, boost-assert, boost-bind, boost-concept-check, boost-config, boost-core, boost-detail, boost-exception, boost-function, boost-iterator, boost-mpl, boost-range, boost-regex, boost-static-assert, boost-throw-exception, boost-tuple, boost-type-traits, boost-unordered, boost-utility, boost-vcpkg-helpers
|
||||
Homepage: https://github.com/boostorg/algorithm
|
||||
Description: Boost algorithm module
|
||||
|
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO boostorg/algorithm
|
||||
REF boost-1.70.0
|
||||
SHA512 3510cb1d837f04b26a009324ed123af756c2f47ec825e0148e11af4cf5a280e7df732552415015e18ccfb63e8077acebb5860c89af7dd3bb0fef878d67373aa2
|
||||
REF boost-1.71.0
|
||||
SHA512 2ed7e5d59a3b3de6b316616212cc88d452c8b977643b3b9ffa9256af29fd739f596a833698462624fae83b0b491aa29bdec8792d2aaf3c4ee477308011af075d
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
|
||||
Source: boost-align
|
||||
Version: 1.70.0
|
||||
Build-Depends: boost-assert, boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
|
||||
Version: 1.71.0
|
||||
Build-Depends: boost-assert, boost-config, boost-core, boost-static-assert, boost-vcpkg-helpers
|
||||
Homepage: https://github.com/boostorg/align
|
||||
Description: Boost align module
|
||||
|
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO boostorg/align
|
||||
REF boost-1.70.0
|
||||
SHA512 862c7e440e9fef88430a18bc3916f236578dca16dbcbc007f23fdbbf114933342d1c4f2c763d189fec510210aa011f3ff9f6f326a0a46ab549857f8afe4f64a1
|
||||
REF boost-1.71.0
|
||||
SHA512 0a30c994a162efa253b5cda7fb03a1bc179c1918eac9690c50396862aff40eaada051ba28dede663454184bc51b095ed3fa45040a66b338a9945cc19729a2a63
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
|
||||
Source: boost-any
|
||||
Version: 1.70.0
|
||||
Version: 1.71.0
|
||||
Build-Depends: boost-config, boost-core, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
|
||||
Homepage: https://github.com/boostorg/any
|
||||
Description: Boost any module
|
||||
|
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO boostorg/any
|
||||
REF boost-1.70.0
|
||||
SHA512 ee0f9badba0d90807a8462fffc1c6880e06dd1cf43333a8f77c8b490007f4ebbdd30fae9046c18b2b8a48c2be8d0a28b3b4f3e8021a3b6491a319716aaa9bca3
|
||||
REF boost-1.71.0
|
||||
SHA512 b197602abf2cf2d0efb796c019c60562fbeceda70ce8083272566740c5d2b4fd73e52a567714f2a89034aec7bb56f441fc9c1e083f08f82395fd86e923e86926
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
|
||||
Source: boost-array
|
||||
Version: 1.70.0
|
||||
Version: 1.71.0
|
||||
Build-Depends: boost-assert, boost-config, boost-core, boost-detail, boost-static-assert, boost-throw-exception, boost-vcpkg-helpers
|
||||
Homepage: https://github.com/boostorg/array
|
||||
Description: Boost array module
|
||||
|
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO boostorg/array
|
||||
REF boost-1.70.0
|
||||
SHA512 d741425add056b019c27b1bfc5f174d31945950f57a23be59dfa7f262902191142486112c1fa0002d58a4771e69c76435196d222aaddee148cc78796c5f3f05b
|
||||
REF boost-1.71.0
|
||||
SHA512 6b4fca7c5fb6630daef7580d3f6e693e2c61d139ce50d940cbe250618793500701c0c96aa708dbd846b6b3bf21ef5b5125486143e9a113577023273e199195e0
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
|
||||
Source: boost-asio
|
||||
Version: 1.70.0-2
|
||||
Version: 1.71.0-1
|
||||
Build-Depends: boost-array, boost-assert, boost-bind, boost-chrono, boost-compatibility, boost-config, boost-coroutine (!uwp), boost-date-time, boost-detail, boost-function, boost-integer, boost-regex, boost-smart-ptr, boost-system, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, openssl
|
||||
Homepage: https://github.com/boostorg/asio
|
||||
Description: Boost asio module
|
||||
|
@ -5,8 +5,8 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO boostorg/asio
|
||||
REF boost-1.70.0
|
||||
SHA512 394c7e557d97bbb8b98453846a098c8ab7f4eb92d752bd4089d2020e0d5060cff1e53f5e50b2f8910e64b66c934b2bde4a7137bd1a6050e8b1279c2e4576b2e5
|
||||
REF boost-1.71.0
|
||||
SHA512 e174e708305caadef89bc0c091bd5bee236315f8c4b5d917db1984de7dbe15fca5296d0ec9ef2668cdd138900582a02c4d056982501b508e55b78f0355f6c98d
|
||||
HEAD_REF master
|
||||
PATCHES windows_alloca_header.patch
|
||||
)
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user