mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-19 02:53:02 +08:00
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425
This commit is contained in:
Phil Christensen
commit
7347305e84
24
.gitignore
vendored
24
.gitignore
vendored
@ -25,7 +25,9 @@ bld/
|
||||
[Bb]in/
|
||||
[Oo]bj/
|
||||
[Ll]og/
|
||||
vcpkg
|
||||
# Ignore the executable
|
||||
/vcpkg
|
||||
/vcpkg.exe
|
||||
|
||||
# Visual Studio 2015 cache/options directory
|
||||
.vs/
|
||||
@ -274,14 +276,20 @@ __pycache__/
|
||||
############################################################
|
||||
|
||||
.vscode/
|
||||
buildtrees/
|
||||
build*/
|
||||
downloads/
|
||||
installed*/
|
||||
packages/
|
||||
scripts/buildsystems/tmp/
|
||||
*.code-workspace
|
||||
/buildtrees/
|
||||
/build*/
|
||||
/downloads/
|
||||
/installed*/
|
||||
/packages/
|
||||
/scripts/buildsystems/tmp/
|
||||
/toolsrc/build.rel/
|
||||
/toolsrc/msbuild.x86.debug/
|
||||
/toolsrc/msbuild.x86.release/
|
||||
/toolsrc/msbuild.x64.debug/
|
||||
/toolsrc/msbuild.x64.release/
|
||||
#ignore custom triplets
|
||||
triplets/*
|
||||
/triplets/*
|
||||
#add vcpkg-designed triplets back in
|
||||
!triplets/arm-uwp.cmake
|
||||
!triplets/arm-windows.cmake
|
||||
|
||||
807
CHANGELOG.md
807
CHANGELOG.md
@ -1,3 +1,810 @@
|
||||
vcpkg (2018.11.23)
|
||||
--------------
|
||||
* Add ports:
|
||||
- aixlog 1.2.1
|
||||
- civetweb 1.11-1
|
||||
- cli11 1.6.1
|
||||
- cub 1.8.0
|
||||
- cutelyst2 2.5.2-1
|
||||
- easyloggingpp 9.96.5-1
|
||||
- ecsutil 1.0.1.2-1
|
||||
- fdlibm 5.3-2
|
||||
- fizz 2018.10.15.00
|
||||
- fmi4cpp 0.4.0
|
||||
- fribidi 1.0.5
|
||||
- glad 0.1.28-3
|
||||
- igloo 1.1.1
|
||||
- libtins 4.0-2
|
||||
- linalg 2.1
|
||||
- miniupnpc 2.1
|
||||
- nanovg master
|
||||
- orc 1.5.2-f47e02c-2
|
||||
- pixel 0.3
|
||||
- plustache 0.4.0-1
|
||||
- prometheus-cpp 0.6.0
|
||||
- rapidcheck 2018-11-05-1
|
||||
- reproc v1.0.0
|
||||
- sdl1 1.2.15-3
|
||||
- sdl1-net 1.2.8-2
|
||||
- snowhouse 3.0.1
|
||||
- so5extra 1.2.1
|
||||
- socket-io-client 1.6.1
|
||||
- stlab 1.3.3
|
||||
- tl-optional 0.5-1
|
||||
- trompeloeil 32-1
|
||||
- vulkan 1.1.82.1
|
||||
* Update ports:
|
||||
- abseil 2018-09-18-3 -> 2018-11-08
|
||||
- args 2018-06-28 -> 2018-10-25
|
||||
- asio 1.12.1 -> 1.12.1-1
|
||||
- asmjit 673dcefaa048c5f5a2bf8b85daf8f7b9978d018a -> 2018-11-08
|
||||
- assimp 4.1.0-2 -> 4.1.0-3
|
||||
- aws-sdk-cpp 1.6.12-1 -> 1.6.47
|
||||
- azure-c-shared-utility 1.1.5 -> 1.1.10-1
|
||||
- azure-iot-sdk-c 1.2.3 -> 1.2.10-1
|
||||
- azure-storage-cpp 5.1.1 -> 5.2.0
|
||||
- azure-uamqp-c 1.2.3 -> 1.2.10-1
|
||||
- azure-uhttp-c LTS_01_2018_Ref01 -> 1.1.10-1
|
||||
- azure-umqtt-c 1.1.5 -> 1.1.10-1
|
||||
- berkeleydb 4.8.30 -> 4.8.30-2
|
||||
- boost-modular-build-helper 2018-08-21 -> 2018-10-19
|
||||
- brynet 0.9.0 -> 1.0.0
|
||||
- bzip2 1.0.6-2 -> 1.0.6-3
|
||||
- c-ares cares-1_14_0 -> cares-1_15_0
|
||||
- catch2 2.4.0 -> 2.4.2
|
||||
- celero 2.3.0-1 -> 2.4.0
|
||||
- cgal 4.13-1 -> 4.13-2
|
||||
- chakracore 1.11.1-1 -> 1.11.2
|
||||
- cimg 2.3.6 -> 2.4.1
|
||||
- clara 2018-04-02 -> 2018-11-01
|
||||
- corrade 2018.04-1 -> 2018.10-1
|
||||
- cpprestsdk 2.10.6-1 -> 2.10.6-3
|
||||
- cxxopts 2.1.0-1 -> 2.1.1
|
||||
- dimcli 3.1.1-2 -> 4.0.1-1
|
||||
- directxmesh aug2018 -> oct2018
|
||||
- directxtex aug2018b -> oct2018
|
||||
- directxtk aug2018 -> oct2018b
|
||||
- doctest 2.0.0 -> 2.0.1
|
||||
- double-conversion 3.1.0 -> 3.1.0-1
|
||||
- eastl 3.12.01 -> 3.12.04
|
||||
- egl-registry 2018-06-30 -> 2018-06-30-1
|
||||
- entityx 1.2.0-1 -> 1.2.0-2
|
||||
- entt 2.7.3 -> 2.7.3-1
|
||||
- exiv2 2018-09-18 -> 2018-11-08
|
||||
- exprtk 2018.09.30-9836f21 -> 2018-10-11
|
||||
- fastcdr 1.0.6-1 -> 1.0.6-2
|
||||
- fftw3 3.3.7-2 -> 3.3.8
|
||||
- flann 1.9.1-7 -> 1.9.1-8
|
||||
- fmt 5.2.0 -> 5.2.1
|
||||
- folly 2018.09.17.00 -> 2018.11.05.00
|
||||
- forest 9.0.5 -> 9.0.6
|
||||
- freeimage 3.17.0-4 -> 3.18.0-2
|
||||
- gdcm2 2.8.7 -> 2.8.8
|
||||
- glm 0.9.9.2 -> 0.9.9.3
|
||||
- google-cloud-cpp 0.1.0-1 -> 0.3.0-1
|
||||
- gtest 1.8.0-9 -> 1.8.1-1
|
||||
- gtk 3.22.19-1 -> 3.22.19-2
|
||||
- hunspell 1.6.1-2 -> 1.6.1-3
|
||||
- jsonnet 2018-09-18 -> 2018-11-01
|
||||
- libfreenect2 0.2.0 -> 0.2.0-1
|
||||
- libgd 2.2.4-3 -> 2.2.4-4
|
||||
- libgeotiff 1.4.2-4 -> 1.4.2-6
|
||||
- liblinear 2.20 -> 221
|
||||
- libpng 1.6.35 -> 1.6.35-1
|
||||
- libpq 9.6.1-4 -> 9.6.1-5
|
||||
- libusb 1.0.21-fc99620 -> 1.0.22-1
|
||||
- libuv 1.23.0 -> 1.24.0
|
||||
- libwebm 1.0.0.27-2 -> 1.0.0.27-3
|
||||
- magnum 2018.04-1 -> 2018.10-1
|
||||
- magnum-extras 2018.04-1 -> 2018.10-1
|
||||
- magnum-integration 2018.04-1 -> 2018.10-1
|
||||
- magnum-plugins 2018.04-1 -> 2018.10-1
|
||||
- matio 1.5.12 -> 1.5.13
|
||||
- metis 5.1.0-1 -> 5.1.0-2
|
||||
- minizip 1.2.11-2 -> 1.2.11-3
|
||||
- mpir 3.0.0-4 -> 3.0.0-5
|
||||
- ms-gsl 2018-09-18 -> 2018-11-08
|
||||
- nghttp2 1.33.0 -> 1.34.0
|
||||
- nlohmann-json 3.3.0 -> 3.4.0
|
||||
- nng 1.0.1 -> 1.1.0
|
||||
- nuklear 2018-09-18 -> 2018-11-01
|
||||
- openal-soft 1.19.0 -> 1.19.1
|
||||
- opencv 3.4.1 -> 3.4.3-3
|
||||
- opengl-registry 2018-06-30 -> 2018-06-30-1
|
||||
- openimageio Release-1.8.13 -> 1.8.16
|
||||
- openssl-unix 1.0.2p -> 1.0.2p-1
|
||||
- opus 1.2.1-1 -> 1.3
|
||||
- osgearth 2.9-1 -> 2.9-2
|
||||
- pcl 1.8.1-12 -> 1.9.0-1
|
||||
- pixman 0.34.0-4 -> 0.34.0-5
|
||||
- portaudio 19.0.6.00-2 -> 19.0.6.00-4
|
||||
- qhull 2015.2-2 -> 2015.2-3
|
||||
- qscintilla 2.10-4 -> 2.10-7
|
||||
- qt5 5.9.2-1 -> 5.11.2
|
||||
- qt5-3d 5.9.2-0 -> 5.11.2
|
||||
- qt5-activeqt 5.9.2-0 -> 5.11.2
|
||||
- qt5-base 5.9.2-7 -> 5.11.2-1
|
||||
- qt5-charts 5.9.2-0 -> 5.11.2
|
||||
- qt5-datavis3d 5.9.2-0 -> 5.11.2
|
||||
- qt5-declarative 5.9.2-0 -> 5.11.2
|
||||
- qt5-gamepad 5.9.2-0 -> 5.11.2
|
||||
- qt5-graphicaleffects 5.9.2-0 -> 5.11.2
|
||||
- qt5-imageformats 5.9.2-0 -> 5.11.2
|
||||
- qt5-modularscripts 4 -> 2018-11-01-1
|
||||
- qt5-multimedia 5.9.2-0 -> 5.11.2
|
||||
- qt5-networkauth 5.9.2-0 -> 5.11.2
|
||||
- qt5-quickcontrols 5.9.2-1 -> 5.11.2
|
||||
- qt5-quickcontrols2 5.9.2-1 -> 5.11.2
|
||||
- qt5-script 5.9.2 -> 5.11.2
|
||||
- qt5-scxml 5.9.2-0 -> 5.11.2
|
||||
- qt5-serialport 5.9.2-0 -> 5.11.2
|
||||
- qt5-speech 5.9.2-0 -> 5.11.2
|
||||
- qt5-svg 5.9.2-0 -> 5.11.2
|
||||
- qt5-tools 5.9.2-0 -> 5.11.2
|
||||
- qt5-virtualkeyboard 5.9.2-0 -> 5.11.2
|
||||
- qt5-websockets 5.9.2-0 -> 5.11.2
|
||||
- qt5-winextras 5.9.2-0 -> 5.11.2
|
||||
- qt5-xmlpatterns 5.9.2-0 -> 5.11.2
|
||||
- qwt 6.1.3-5 -> 6.1.3-6
|
||||
- range-v3 0.3.5 -> 0.4.0-20181122
|
||||
- rapidjson 1.1.0-1 -> 1.1.0-2
|
||||
- re2 2018-09-18 -> 2018-11-01
|
||||
- rocksdb 5.14.2 -> 5.15.10
|
||||
- rs-core-lib 2018-09-18 -> 2018-10-25
|
||||
- rttr 0.9.5-2 -> 0.9.5-3
|
||||
- scintilla 4.0.3 -> 4.1.2
|
||||
- sdl2 2.0.8-1 -> 2.0.9-1
|
||||
- sfml 2.5.0-2 -> 2.5.1
|
||||
- sobjectizer 5.5.22.1 -> 5.5.23
|
||||
- spdlog 1.0.0 -> 1.2.1
|
||||
- sqlite3 3.24.0-1 -> 3.25.2
|
||||
- suitesparse 4.5.5-4 -> 5.1.2
|
||||
- tbb 2018_U5-4 -> 2018_U6
|
||||
- thrift 2018-09-18 -> 2018-11-01
|
||||
- tiff 4.0.9-4 -> 4.0.10
|
||||
- tiny-dnn 2018-09-18 -> 2018-10-25
|
||||
- unicorn 2018-09-18 -> 2018-10-25
|
||||
- unicorn-lib 2018-09-18 -> 2018-10-25
|
||||
- uriparser 0.8.6 -> 0.9.0
|
||||
- vtk 8.1.0-1 -> 8.1.0-3
|
||||
- vxl 20180414-7a130cf-1 -> v1.18.0-2
|
||||
- wangle v2018.07.30.00-1 -> 2018.11.05.00
|
||||
- websocketpp 0.7.0-1 -> 0.8.1
|
||||
- winpcap 4.1.3-1 -> 4.1.3-2
|
||||
- xalan-c 1.11-1 -> 1.11-4
|
||||
- xerces-c 3.1.4-3 -> 3.2.2-5
|
||||
- yoga 1.9.0 -> 1.10.0
|
||||
- zeromq 2018-09-18 -> 2018-11-01
|
||||
* `vcpkg install`: Improve error messages
|
||||
* `vcpkg hash`: Now also tries `shaABCsum tools`, instead of only `shasum`. Allows building in OSes like Alpine.
|
||||
* `vcpkg edit`: No longer launches the editor in a clean (purged) environment.
|
||||
* `vcpkg upgrade`: now tab-completed in powershell (it was missing before).
|
||||
* Add new function: `vcpkg_from_git()`
|
||||
* Enable Visual Studio versions greater than 15.
|
||||
* Add Visual Studio Code autotection on OSX (#4589)
|
||||
* Work-around hash issue caused by NuGet adding signatures to all their files.
|
||||
* Improve building `vcpkg.exe` (Windows-only):
|
||||
- Builds out of source
|
||||
- Temporary files are removed after bootstrap
|
||||
- User Property Pages are ignored (#4620)
|
||||
* `vcpkg` now prints URL and filepath, when downloading a tool (#4640)
|
||||
* Bump version of `cmake` to 3.12.4
|
||||
* Bump version of `git` to 2.9.1
|
||||
|
||||
-- vcpkg team <vcpkg@microsoft.com> FRI, 23 Nov 2018 14:30:00 -0800
|
||||
|
||||
|
||||
vcpkg (2018.10.20)
|
||||
--------------
|
||||
* Add ports:
|
||||
- 3fd 2.6.2
|
||||
- argtable2 2.13-1
|
||||
- asyncplusplus 1.0-1
|
||||
- bde 3.2.0.0
|
||||
- boost-hana-msvc 1.67.0-1
|
||||
- boost-yap 1.68.0
|
||||
- check 0.12.0-1
|
||||
- concurrentqueue 1.0.0-beta
|
||||
- crossguid 0.2.2-2018-06-16
|
||||
- darts-clone 1767ab87cffe
|
||||
- dcmtk 3.6.3
|
||||
- docopt 2018-04-16-2
|
||||
- egl-registry 2018-06-30
|
||||
- embree2 2.16.4-3
|
||||
- embree3 3.2.0-2
|
||||
- esaxx ca7cb332011ec37
|
||||
- fastfeat 391d5e9
|
||||
- fmilib 2.0.3
|
||||
- fruit 3.4.0-1
|
||||
- getopt 0
|
||||
- getopt-win32 0.1
|
||||
- gmmlib 18.3.pre2-1
|
||||
- graphqlparser v0.7.0
|
||||
- ideviceinstaller 1.1.2.23-1
|
||||
- idevicerestore 1.0.12-1
|
||||
- inih 42
|
||||
- intelrdfpmathlib 20U2
|
||||
- io2d 0.1-1
|
||||
- json11 2017-06-20
|
||||
- kangaru 4.1.2
|
||||
- kf5archive 5.50.0
|
||||
- kf5holidays 5.50.0
|
||||
- laszip 3.2.2-1
|
||||
- libdshowcapture 0.6.0
|
||||
- libideviceactivation 1.0.38-1
|
||||
- libimobiledevice 1.2.1.215-1
|
||||
- libirecovery 1.0.25-2
|
||||
- liblemon 1.3.1-2
|
||||
- libmaxminddb 1.3.2-1
|
||||
- libmodbus 3.1.4-1
|
||||
- libmorton 2018-19-07
|
||||
- libplist 2.0.1.197-2
|
||||
- libusbmuxd 1.0.107-2
|
||||
- libyaml 0.2.1-1
|
||||
- linenoise-ng 4754bee2d8eb3
|
||||
- luabridge 2.1-1
|
||||
- milerius-sfml-imgui 1.1
|
||||
- minisat-master-keying 2.2-mod-1
|
||||
- mio 2018-10-18-1
|
||||
- modp-base64
|
||||
- morton-nd 2.0.0
|
||||
- nanorange 0.0.0
|
||||
- nng 1.0.1
|
||||
- ogdf 2018-03-28-2
|
||||
- opengl-registry 2018-06-30
|
||||
- openssl-unix 1.0.2p
|
||||
- openssl-uwp 1.0.2l-winrt
|
||||
- openssl-windows 1.0.2p-1
|
||||
- osg-qt 3.5.7
|
||||
- parquet 1.4.0
|
||||
- pcg 0.98.1
|
||||
- pegtl 2.7.1
|
||||
- plib 1.8.5-2
|
||||
- pngwriter 0.7.0-1
|
||||
- python2 2.7.15-1
|
||||
- qt5-activeqt 5.9.2-0
|
||||
- qt5-script 5.9.2
|
||||
- readerwriterqueue 1.0.0
|
||||
- readline 0
|
||||
- readline-win32 5.0-2
|
||||
- restbed 4.16-07-28-2018
|
||||
- safeint 3.19.2
|
||||
- sais 2.4.1
|
||||
- selene 0.1.1
|
||||
- shiva 1.0
|
||||
- shiva-sfml 1.0
|
||||
- simpleini 2018-08-31-1
|
||||
- soil 2008.07.07-1
|
||||
- sol2 2.20.4
|
||||
- spaceland 7.8.2-0
|
||||
- spirv-cross 2018-08-07-1
|
||||
- tinyfiledialogs 3.3.7-1
|
||||
- tinyobjloader 1.2.0-1
|
||||
- tinyspline 0.2.0-1
|
||||
- tinyutf8 2.1.1-1
|
||||
- tl-expected 0.3-1
|
||||
- tmx 1.0.0
|
||||
- tmxparser 2.1.0-1
|
||||
- usbmuxd 1.1.1.133-1
|
||||
- usrsctp 35c1d97020a
|
||||
- uvw 1.11.2
|
||||
- vtk-dicom 0.8.8-alpha-1
|
||||
- vulkan-memory-allocator 2.1.0-1
|
||||
- wangle v2018.07.30.00-1
|
||||
- woff2 1.0.2
|
||||
* Update ports:
|
||||
- abseil 2018-05-01-1 -> 2018-09-18-3
|
||||
- ace 6.4.8 -> 6.5.2
|
||||
- alembic 1.7.8 -> 1.7.9
|
||||
- allegro5 5.2.3.0 -> 5.2.4.0
|
||||
- angle 2017-06-14-8d471f-4 -> 2017-06-14-8d471f-5
|
||||
- apr 1.6.3 -> 1.6.5
|
||||
- args 2018-05-17 -> 2018-06-28
|
||||
- arrow 0.6.0-1 -> 0.9.0-1
|
||||
- asio 1.12.0-2 -> 1.12.1
|
||||
- assimp 4.1.0-1 -> 4.1.0-2
|
||||
- aws-sdk-cpp 1.4.52 -> 1.6.12-1
|
||||
- azure-c-shared-utility 1.1.3 -> 1.1.5
|
||||
- azure-storage-cpp 4.0.0 -> 5.1.1
|
||||
- azure-uhttp-c 2018-02-09 -> LTS_01_2018_Ref01
|
||||
- azure-umqtt-c 1.1.3 -> 1.1.5
|
||||
- benchmark 1.4.0 -> 1.4.1
|
||||
- blaze 3.3 -> 3.4-1
|
||||
- boost 1.67.0 -> 1.68.0
|
||||
- boost-accumulators 1.67.0 -> 1.68.0
|
||||
- boost-algorithm 1.67.0 -> 1.68.0
|
||||
- boost-align 1.67.0 -> 1.68.0
|
||||
- boost-any 1.67.0 -> 1.68.0
|
||||
- boost-array 1.67.0 -> 1.68.0
|
||||
- boost-asio 1.67.0-1 -> 1.68.0-1
|
||||
- boost-assert 1.67.0 -> 1.68.0
|
||||
- boost-assign 1.67.0 -> 1.68.0
|
||||
- boost-atomic 1.67.0 -> 1.68.0
|
||||
- boost-beast 1.67.0 -> 1.68.0
|
||||
- boost-bimap 1.67.0 -> 1.68.0
|
||||
- boost-bind 1.67.0 -> 1.68.0
|
||||
- boost-build 1.67.0 -> 1.68.0
|
||||
- boost-callable-traits 1.67.0 -> 1.68.0
|
||||
- boost-chrono 1.67.0 -> 1.68.0
|
||||
- boost-circular-buffer 1.67.0 -> 1.68.0
|
||||
- boost-compatibility 1.67.0 -> 1.68.0
|
||||
- boost-compute 1.67.0 -> 1.68.0
|
||||
- boost-concept-check 1.67.0 -> 1.68.0
|
||||
- boost-config 1.67.0 -> 1.68.0
|
||||
- boost-container 1.67.0 -> 1.68.0
|
||||
- boost-container-hash 1.67.0 -> 1.68.0
|
||||
- boost-context 1.67.0 -> 1.68.0-1
|
||||
- boost-contract 1.67.0 -> 1.68.0
|
||||
- boost-conversion 1.67.0 -> 1.68.0
|
||||
- boost-convert 1.67.0 -> 1.68.0
|
||||
- boost-core 1.67.0 -> 1.68.0
|
||||
- boost-coroutine 1.67.0 -> 1.68.0
|
||||
- boost-coroutine2 1.67.0 -> 1.68.0
|
||||
- boost-crc 1.67.0 -> 1.68.0
|
||||
- boost-date-time 1.67.0 -> 1.68.0
|
||||
- boost-detail 1.67.0 -> 1.68.0
|
||||
- boost-di 1.0.1 -> 1.0.2
|
||||
- boost-disjoint-sets 1.67.0 -> 1.68.0
|
||||
- boost-dll 1.67.0 -> 1.68.0
|
||||
- boost-dynamic-bitset 1.67.0 -> 1.68.0
|
||||
- boost-endian 1.67.0 -> 1.68.0
|
||||
- boost-exception 1.67.0 -> 1.68.0
|
||||
- boost-fiber 1.67.0 -> 1.68.0
|
||||
- boost-filesystem 1.67.0 -> 1.68.0
|
||||
- boost-flyweight 1.67.0 -> 1.68.0
|
||||
- boost-foreach 1.67.0 -> 1.68.0
|
||||
- boost-format 1.67.0 -> 1.68.0
|
||||
- boost-function 1.67.0 -> 1.68.0
|
||||
- boost-function-types 1.67.0 -> 1.68.0
|
||||
- boost-functional 1.67.0 -> 1.68.0
|
||||
- boost-fusion 1.67.0 -> 1.68.0
|
||||
- boost-geometry 1.67.0 -> 1.68.0
|
||||
- boost-gil 1.67.0 -> 1.68.0
|
||||
- boost-graph 1.67.0 -> 1.68.0
|
||||
- boost-graph-parallel 1.67.0 -> 1.68.0
|
||||
- boost-hana 1.67.0 -> 1.68.0-1
|
||||
- boost-heap 1.67.0 -> 1.68.0
|
||||
- boost-hof 1.67.0 -> 1.68.0
|
||||
- boost-icl 1.67.0 -> 1.68.0
|
||||
- boost-integer 1.67.0 -> 1.68.0
|
||||
- boost-interprocess 1.67.0 -> 1.68.0
|
||||
- boost-interval 1.67.0 -> 1.68.0
|
||||
- boost-intrusive 1.67.0 -> 1.68.0
|
||||
- boost-io 1.67.0 -> 1.68.0
|
||||
- boost-iostreams 1.67.0 -> 1.68.0
|
||||
- boost-iterator 1.67.0 -> 1.68.0
|
||||
- boost-lambda 1.67.0 -> 1.68.0
|
||||
- boost-lexical-cast 1.67.0 -> 1.68.0
|
||||
- boost-local-function 1.67.0 -> 1.68.0
|
||||
- boost-locale 1.67.0 -> 1.68.0
|
||||
- boost-lockfree 1.67.0 -> 1.68.0-1
|
||||
- boost-log 1.67.0 -> 1.68.0
|
||||
- boost-logic 1.67.0 -> 1.68.0
|
||||
- boost-math 1.67.0 -> 1.68.0
|
||||
- boost-metaparse 1.67.0 -> 1.68.0
|
||||
- boost-modular-build-helper 2018-05-14 -> 2018-08-21
|
||||
- boost-move 1.67.0 -> 1.68.0
|
||||
- boost-mp11 1.67.0 -> 1.68.0
|
||||
- boost-mpi 1.67.0-1 -> 1.68.0-1
|
||||
- boost-mpl 1.67.0 -> 1.68.0
|
||||
- boost-msm 1.67.0 -> 1.68.0
|
||||
- boost-multi-array 1.67.0 -> 1.68.0
|
||||
- boost-multi-index 1.67.0 -> 1.68.0
|
||||
- boost-multiprecision 1.67.0 -> 1.68.0
|
||||
- boost-numeric-conversion 1.67.0 -> 1.68.0
|
||||
- boost-odeint 1.67.0 -> 1.68.0
|
||||
- boost-optional 1.67.0 -> 1.68.0
|
||||
- boost-parameter 1.67.0 -> 1.68.0
|
||||
- boost-phoenix 1.67.0 -> 1.68.0
|
||||
- boost-poly-collection 1.67.0 -> 1.68.0
|
||||
- boost-polygon 1.67.0 -> 1.68.0
|
||||
- boost-pool 1.67.0 -> 1.68.0
|
||||
- boost-predef 1.67.0 -> 1.68.0
|
||||
- boost-preprocessor 1.67.0 -> 1.68.0
|
||||
- boost-process 1.67.0 -> 1.68.0
|
||||
- boost-program-options 1.67.0 -> 1.68.0
|
||||
- boost-property-map 1.67.0 -> 1.68.0
|
||||
- boost-property-tree 1.67.0 -> 1.68.0
|
||||
- boost-proto 1.67.0 -> 1.68.0
|
||||
- boost-ptr-container 1.67.0 -> 1.68.0
|
||||
- boost-python 1.67.0-1 -> 1.68.0-2
|
||||
- boost-qvm 1.67.0 -> 1.68.0
|
||||
- boost-random 1.67.0 -> 1.68.0
|
||||
- boost-range 1.67.0 -> 1.68.0
|
||||
- boost-ratio 1.67.0 -> 1.68.0
|
||||
- boost-rational 1.67.0 -> 1.68.0
|
||||
- boost-regex 1.67.0 -> 1.68.0
|
||||
- boost-scope-exit 1.67.0 -> 1.68.0
|
||||
- boost-serialization 1.67.0 -> 1.68.0
|
||||
- boost-signals 1.67.0 -> 1.68.0
|
||||
- boost-signals2 1.67.0 -> 1.68.0
|
||||
- boost-smart-ptr 1.67.0 -> 1.68.0
|
||||
- boost-sort 1.67.0 -> 1.68.0
|
||||
- boost-spirit 1.67.0 -> 1.68.0
|
||||
- boost-stacktrace 1.67.0 -> 1.68.0
|
||||
- boost-statechart 1.67.0 -> 1.68.0
|
||||
- boost-static-assert 1.67.0 -> 1.68.0
|
||||
- boost-system 1.67.0 -> 1.68.0
|
||||
- boost-test 1.67.0-2 -> 1.68.0-2
|
||||
- boost-thread 1.67.0 -> 1.68.0
|
||||
- boost-throw-exception 1.67.0 -> 1.68.0
|
||||
- boost-timer 1.67.0 -> 1.68.0
|
||||
- boost-tokenizer 1.67.0 -> 1.68.0
|
||||
- boost-tti 1.67.0 -> 1.68.0
|
||||
- boost-tuple 1.67.0 -> 1.68.0
|
||||
- boost-type-erasure 1.67.0 -> 1.68.0
|
||||
- boost-type-index 1.67.0 -> 1.68.0
|
||||
- boost-type-traits 1.67.0 -> 1.68.0
|
||||
- boost-typeof 1.67.0 -> 1.68.0
|
||||
- boost-ublas 1.67.0 -> 1.68.0
|
||||
- boost-units 1.67.0 -> 1.68.0
|
||||
- boost-unordered 1.67.0 -> 1.68.0
|
||||
- boost-utility 1.67.0 -> 1.68.0
|
||||
- boost-uuid 1.67.0 -> 1.68.0
|
||||
- boost-variant 1.67.0 -> 1.68.0
|
||||
- boost-vmd 1.67.0 -> 1.68.0
|
||||
- boost-wave 1.67.0 -> 1.68.0
|
||||
- boost-winapi 1.67.0 -> 1.68.0
|
||||
- boost-xpressive 1.67.0 -> 1.68.0
|
||||
- botan 2.0.1 -> 2.8.0
|
||||
- breakpad 2018-04-17 -> 2018-09-18
|
||||
- brotli 1.0.2-3 -> 1.0.2-4
|
||||
- cairo 1.15.8-1 -> 1.15.8-3
|
||||
- cartographer 0.3.0-4 -> 0.3.0-5
|
||||
- catch2 2.2.2 -> 2.4.0
|
||||
- celero 2.1.0-2 -> 2.3.0-1
|
||||
- cgal 4.12 -> 4.13-1
|
||||
- chaiscript 6.0.0 -> 6.1.0
|
||||
- chakracore 1.8.4 -> 1.11.1-1
|
||||
- cimg 2.2.3 -> 2.3.6
|
||||
- clockutils 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-1 -> 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-2
|
||||
- cmark 0.28.3-1 -> 0.28.3-2
|
||||
- coolprop 6.1.0-3 -> 6.1.0-4
|
||||
- cpprestsdk 2.10.2-1 -> 2.10.6-1
|
||||
- crc32c 1.0.5 -> 1.0.5-1
|
||||
- cryptopp 6.1.0-2 -> 7.0.0
|
||||
- curl 7.60.0 -> 7.61.1-1
|
||||
- cxxopts 1.3.0 -> 2.1.0-1
|
||||
- dimcli 3.1.1-1 -> 3.1.1-2
|
||||
- directxmesh may2018 -> aug2018
|
||||
- directxtex may2018 -> aug2018b
|
||||
- directxtk may2018 -> aug2018
|
||||
- discord-rpc 3.3.0 -> 3.3.0-1
|
||||
- dlib 19.10-1 -> 19.16
|
||||
- doctest 1.2.9 -> 2.0.0
|
||||
- double-conversion 3.0.0-2 -> 3.1.0
|
||||
- draco 1.2.5 -> 1.3.3
|
||||
- eastl 3.09.00 -> 3.12.01
|
||||
- ecm 5.40.0 -> 5.50.0
|
||||
- eigen3 3.3.4-2 -> 3.3.5
|
||||
- entt 2.5.0 -> 2.7.3
|
||||
- exiv2 2018-05-17 -> 2018-09-18
|
||||
- expat 2.2.5 -> 2.2.6
|
||||
- exprtk 2018.04.30-46877b6 -> 2018.09.30-9836f21
|
||||
- fastrtps 1.5.0 -> 1.5.0-1
|
||||
- fdk-aac 2018-05-17 -> 2018-07-08
|
||||
- flatbuffers 1.8.0-2 -> 1.9.0-2
|
||||
- fmt 4.1.0 -> 5.2.0
|
||||
- folly 2018.05.14.00 -> 2018.09.17.00
|
||||
- fontconfig 2.12.4-1 -> 2.12.4-7
|
||||
- forest 7.0.7 -> 9.0.5
|
||||
- freeglut 3.0.0-4 -> 3.0.0-5
|
||||
- freetype-gl 2018-02-25 -> 2018-09-18
|
||||
- gdal 2.3.0-1 -> 2.3.2
|
||||
- gdcm2 2.8.6 -> 2.8.7
|
||||
- geogram 1.6.0-1 -> 1.6.4
|
||||
- geos 3.6.2-3 -> 3.6.3-2
|
||||
- glbinding 2.1.1-3 -> 3.0.2-3
|
||||
- glfw3 3.2.1-2 -> 3.2.1-3
|
||||
- glib 2.52.3-9 -> 2.52.3-11
|
||||
- glm 0.9.8.5-1 -> 0.9.9.2
|
||||
- globjects 1.0.0-1 -> 1.1.0-2018-09-19
|
||||
- glslang 2018-03-02 -> 2018-03-02-1
|
||||
- google-cloud-cpp 0.1.0 -> 0.1.0-1
|
||||
- graphicsmagick 1.3.28 -> 1.3.30-1
|
||||
- graphite2 1.3.10 -> 1.3.12
|
||||
- grpc 1.10.1-2 -> 1.14.1
|
||||
- gtest 1.8.0-8 -> 1.8.0-9
|
||||
- guetzli 2017-09-02-cb5e4a86f69628-1 -> 2018-07-30
|
||||
- gumbo 0.10.1-1 -> 0.10.1-2
|
||||
- harfbuzz 1.7.6-1 -> 1.8.4-2
|
||||
- http-parser 2.7.1-3 -> 2.8.1
|
||||
- hwloc 1.11.7-2 -> 1.11.7-3
|
||||
- icu 61.1-1 -> 61.1-4
|
||||
- imgui 1.60 -> 1.65
|
||||
- json-dto 0.2.5 -> 0.2.6
|
||||
- jsonnet 2018-05-17 -> 2018-09-18
|
||||
- kf5plotting 5.37.0 -> 5.50.0
|
||||
- lcms 2.8-4 -> 2.8-5
|
||||
- leptonica 1.74.4-3 -> 1.76.0
|
||||
- libarchive 3.3.2-1 -> 3.3.3-2
|
||||
- libflac 1.3.2-5 -> 1.3.2-6
|
||||
- libgeotiff 1.4.2-3 -> 1.4.2-4
|
||||
- libgit2 0.26.0 -> 0.27.4-2
|
||||
- libgo 2.7 -> 2.8-2
|
||||
- liblzma 5.2.3-2 -> 5.2.4
|
||||
- libmariadb 3.0.2 -> 3.0.2-1
|
||||
- libmysql 8.0.4-2 -> 8.0.4-3
|
||||
- libodb 2.4.0-2 -> 2.4.0-3
|
||||
- libodb-mysql 2.4.0-1 -> 2.4.0-2
|
||||
- libp7-baical 4.4-2 -> 4.4-3
|
||||
- libpng 1.6.34-3 -> 1.6.35
|
||||
- libpqxx 6.0.0 -> 6.0.0-1
|
||||
- libraw 0.18.2-5 -> 0.19.0-1
|
||||
- libsndfile 1.0.29-6830c42-3 -> 1.0.29-6830c42-5
|
||||
- libssh 0.7.5-4 -> 0.7.6
|
||||
- libssh2 1.8.0-3 -> 1.8.0-4
|
||||
- libuv 1.20.3-2 -> 1.23.0
|
||||
- libvorbis 1.3.5-143caf4-3 -> 1.3.6-112d3bd-1
|
||||
- libwebsockets 3.0.0 -> 3.0.1
|
||||
- libzip rel-1-5-1 -> rel-1-5-1-vcpkg1
|
||||
- live555 2018.02.28 -> latest
|
||||
- llvm 6.0.0-1 -> 7.0.0
|
||||
- log4cplus REL_2_0_0-RC2 -> REL_2_0_1
|
||||
- luasocket 2018-02-25 -> 2018-09-18
|
||||
- lz4 1.8.2 -> 1.8.3
|
||||
- mbedtls 2.6.1 -> 2.13.1
|
||||
- mongo-cxx-driver 3.1.1-2 -> 3.1.1-3
|
||||
- monkeys-audio 4.3.3 -> 4.3.3-1
|
||||
- mosquitto 1.4.15 -> 1.5.0
|
||||
- ms-gsl 2018-05-17 -> 2018-09-18
|
||||
- mujs 2018-05-17 -> 2018-07-30
|
||||
- nana 1.5.5 -> 1.6.2
|
||||
- nanodbc 2.12.4-1 -> 2.12.4-2
|
||||
- nanomsg 1.1.2 -> 1.1.4
|
||||
- nghttp2 1.30.0-1 -> 1.33.0
|
||||
- nlohmann-json 3.1.2 -> 3.3.0
|
||||
- nlopt 2.4.2-c43afa08d~vcpkg1-1 -> 2.4.2-1226c127
|
||||
- nuklear 2018-05-17 -> 2018-09-18
|
||||
- octomap cefed0c1d79afafa5aeb05273cf1246b093b771c-2 -> cefed0c1d79afafa5aeb05273cf1246b093b771c-3
|
||||
- openal-soft 1.18.2-2 -> 1.19.0
|
||||
- openimageio Release-1.9.2dev -> Release-1.8.13
|
||||
- openmama 6.2.1-a5a93a24d2f89a0def0145552c8cd4a53c69e2de -> 6.2.2
|
||||
- openmesh 6.3 -> 7.0
|
||||
- openssl 1.0.2o-2 -> 0
|
||||
- openvr 1.0.15 -> 1.0.16
|
||||
- opusfile 0.9-1 -> 0.11-1
|
||||
- osg 3.5.6-2 -> 3.6.2
|
||||
- osgearth 2.9 -> 2.9-1
|
||||
- paho-mqtt 1.2.0-3 -> 1.2.1
|
||||
- parson 2018-05-17 -> 2018-09-18
|
||||
- pcl 1.8.1-10 -> 1.8.1-12
|
||||
- pdal 1.7.1-2 -> 1.7.1-3
|
||||
- pdcurses 3.4-1 -> 3.6
|
||||
- picosha2 2018-02-25 -> 2018-07-30
|
||||
- pixman 0.34.0-2 -> 0.34.0-4
|
||||
- plibsys 0.0.3-1 -> 0.0.4-1
|
||||
- pmdk 1.4-2 -> 1.4.2
|
||||
- poco 1.9.0 -> 1.9.0-1
|
||||
- podofo 0.9.5-2 -> 0.9.6
|
||||
- protobuf 3.5.1-4 -> 3.6.1-4
|
||||
- pybind11 2.2.1 -> 2.2.3-1
|
||||
- python3 3.6.4-1 -> 3.6.4-2
|
||||
- qpid-proton 0.18.1 -> 0.24.0
|
||||
- qt5-base 5.9.2-6 -> 5.9.2-7
|
||||
- qt5-modularscripts 3 -> 4
|
||||
- re2 2018-05-17 -> 2018-09-18
|
||||
- realsense2 2.10.4 -> 2.16.1
|
||||
- restinio 0.4.5.1 -> 0.4.8
|
||||
- rocksdb 5.13.1 -> 5.14.2
|
||||
- rs-core-lib 2018-05-17 -> 2018-09-18
|
||||
- sciter 4.1.7 -> 4.2.2
|
||||
- sdl2-image 2.0.2-1 -> 2.0.2-3
|
||||
- sfgui 0.3.2-1 -> 0.3.2-2
|
||||
- sfml 2.4.2-3 -> 2.5.0-2
|
||||
- shaderc 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-1 -> 12fb656ab20ea9aa06e7084a74e5ff832b7ce2da-2
|
||||
- signalrclient 1.0.0-beta1-3 -> 1.0.0-beta1-4
|
||||
- sobjectizer 5.5.22 -> 5.5.22.1
|
||||
- soci 2016.10.22-1 -> 3.2.3-1
|
||||
- spdlog 0.16.3 -> 1.0.0
|
||||
- sqlite-modern-cpp 3.2 -> 3.2-e2248fa
|
||||
- sqlite-orm 1.1 -> 1.2
|
||||
- sqlite3 3.23.1-1 -> 3.24.0-1
|
||||
- string-theory 1.7 -> 2.1
|
||||
- strtk 2018.05.07-48c9554 -> 2018.09.30-b887974
|
||||
- sundials 2.7.0-1 -> 3.1.1
|
||||
- tbb 2018_U3 -> 2018_U5-4
|
||||
- tesseract 3.05.01-3 -> 3.05.02
|
||||
- thor 2.0-1 -> 2.0-2
|
||||
- thrift 2018-05-17 -> 2018-09-18
|
||||
- tiff 4.0.9 -> 4.0.9-4
|
||||
- tiny-dnn 2018-03-13 -> 2018-09-18
|
||||
- torch-th 20180131-89ede3ba90c906a8ec6b9a0f4bef188ba5bb2fd8-2 -> 2018-07-03
|
||||
- unicorn 2018-05-17 -> 2018-09-18
|
||||
- unicorn-lib 2018-05-17 -> 2018-09-18
|
||||
- uriparser 0.8.5 -> 0.8.6
|
||||
- wt 4.0.3 -> 4.0.4
|
||||
- x264 152-e9a5903edf8ca59-1 -> 157-303c484ec828ed0
|
||||
- xlnt 1.2.0-1 -> 1.3.0-1
|
||||
- yaml-cpp 0.6.2 -> 0.6.2-2
|
||||
- yara e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9 -> e3439e4ead4ed5d3b75a0b46eaf15ddda2110bb9-1
|
||||
- yoga 1.8.0-1 -> 1.9.0
|
||||
- zeromq 2018-05-17 -> 2018-09-18
|
||||
* Change version format of the `vcpkg` tool to a date
|
||||
* Improve handling of ctrl-c inside `install` or `build`
|
||||
* Improvements in `vcpkg edit`:
|
||||
- Fix console blocking when using VSCode and no other instance of VSCode is running
|
||||
- `--all` option now opens package folders
|
||||
- Now checks the default user-wide installation dir of VSCode (in addition to system-wide)
|
||||
* `vcpkg env`: add argument to execute a command in the environment of the selected triplet
|
||||
- e.g. `vcpkg env --triplet x64-windows "cl.exe"`
|
||||
* Survey message changes:
|
||||
- Survey message may pop-up only in `install`, `remove`, `export`, `update`. This prevents issues with parsing the output of other more script-oriented commands
|
||||
- Adjust the survey frequency to 6 months, with an additional once after 10 days of use
|
||||
- Improve metrics performance on Windows
|
||||
* Fix OSX build for old gcc versions
|
||||
* Fix handling of symlink when installing or removing a library
|
||||
* Use -fPIC in all builds to enable mixing static libs with shared objects.
|
||||
* Move graph options to `vcpkg depend-info` (from `vcpkg search`)
|
||||
* Add `vcpkg_from_gitlab` function
|
||||
* Documentation improvements in various `vcpkg_*` cmake functions
|
||||
|
||||
-- vcpkg team <vcpkg@microsoft.com> SAT, 20 Oct 2018 17:00:00 -0800
|
||||
|
||||
|
||||
vcpkg (0.0.113)
|
||||
--------------
|
||||
* Add ports:
|
||||
- json-dto 0.2.5
|
||||
- keystone 0.9.1
|
||||
- osgearth 2.9
|
||||
- pdal 1.7.1-2
|
||||
- sdl2pp 0.16.0-1
|
||||
* Update ports:
|
||||
- args 2018-02-23 -> 2018-05-17
|
||||
- aws-sdk-cpp 1.4.40 -> 1.4.52
|
||||
- chakracore 1.8.3 -> 1.8.4
|
||||
- cimg 2.2.2 -> 2.2.3
|
||||
- curl 7_59_0-2 -> 7.60.0
|
||||
- directxmesh apr2018 -> may2018
|
||||
- directxtex apr2018 -> may2018
|
||||
- directxtk apr2018 -> may2018
|
||||
- doctest 1.2.8 -> 1.2.9
|
||||
- entt 2.4.2-1 -> 2.5.0
|
||||
- exiv2 2018-04-25 -> 2018-05-17
|
||||
- fdk-aac 2018-03-07 -> 2018-05-17
|
||||
- forest 7.0.6 -> 7.0.7
|
||||
- gdal 2.2.2-1 -> 2.3.0-1
|
||||
- grpc 1.10.1-1 -> 1.10.1-2
|
||||
- jsonnet 2018-05-01 -> 2018-05-17
|
||||
- libuv 1.20.2 -> 1.20.3-2
|
||||
- libwebsockets 2.4.2 -> 3.0.0
|
||||
- lodepng 2018-02-25 -> 2018-05-17
|
||||
- mpg123 1.25.8-4 -> 1.25.8-5
|
||||
- ms-gsl 2018-05-01 -> 2018-05-17
|
||||
- mujs 2018-05-01 -> 2018-05-17
|
||||
- nuklear 2018-04-25 -> 2018-05-17
|
||||
- opus 1.2.1 -> 1.2.1-1
|
||||
- parson 2018-04-17 -> 2018-05-17
|
||||
- pmdk 1.4-1 -> 1.4-2
|
||||
- podofo 0.9.5-1 -> 0.9.5-2
|
||||
- re2 2018-05-01 -> 2018-05-17
|
||||
- rocksdb 5.12.4 -> 5.13.1
|
||||
- rs-core-lib 2018-05-01 -> 2018-05-17
|
||||
- sdl2-mixer 2.0.2-2 -> 2.0.2-4
|
||||
- thrift 2018-05-01 -> 2018-05-17
|
||||
- unicorn 2018-04-25 -> 2018-05-17
|
||||
- unicorn-lib 2018-05-01 -> 2018-05-17
|
||||
- uwebsockets 0.14.8-1 -> 0.14.8-2
|
||||
- wtl 10.0 -> 10.0-1
|
||||
- zeromq 2018-05-01 -> 2018-05-17
|
||||
* `vcpkg` no longer calls `powershell` from `cmake`.
|
||||
- This completes the fix for the issue where `vcpkg.exe` would change the console's font when invoking `powershell`.
|
||||
- `Powershell` is no longer called other than for bootstrap and powershell integration for tab-completion.
|
||||
|
||||
-- vcpkg team <vcpkg@microsoft.com> SAT, 16 May 2018 19:30:00 -0800
|
||||
|
||||
|
||||
vcpkg (0.0.112)
|
||||
--------------
|
||||
* Add ports:
|
||||
- robin-map 0.2.0
|
||||
* Update ports:
|
||||
- abseil 2018-04-25-1 -> 2018-05-01-1
|
||||
- ace 6.4.7 -> 6.4.8
|
||||
- aws-sdk-cpp 1.4.38 -> 1.4.40
|
||||
- azure-storage-cpp 3.2.1 -> 4.0.0
|
||||
- blosc 1.13.5 -> 1.13.5-1
|
||||
- boost-modular-build-helper 2018-04-16-4 -> 2018-05-14
|
||||
- brotli 1.0.2-2 -> 1.0.2-3
|
||||
- catch-classic 1.12.1 -> 1.12.2
|
||||
- folly 2018.04.23.00 -> 2018.05.14.00
|
||||
- jsonnet 2018-04-25 -> 2018-05-01
|
||||
- ms-gsl 2018-04-25 -> 2018-05-01
|
||||
- mujs 25821e6d74fab5fcc200fe5e818362e03e114428 -> 2018-05-01
|
||||
- openimageio 1.8.10 -> Release-1.9.2dev
|
||||
- openvr 1.0.14 -> 1.0.15
|
||||
- protobuf 3.5.1-3 -> 3.5.1-4
|
||||
- re2 2018-03-17 -> 2018-05-01
|
||||
- rs-core-lib 2018-04-25 -> 2018-05-01
|
||||
- sol 2.20.0 -> 2.20.0-1
|
||||
- thrift 2018-04-25 -> 2018-05-01
|
||||
- unicorn-lib 2018-04-09 -> 2018-05-01
|
||||
- zeromq 2018-04-25 -> 2018-05-01
|
||||
* `vcpkg` no longer calls powershell for downloading/extracting and detecting Visual Studio.
|
||||
- This also fixes an issue where `vcpkg.exe` would change the console's font when invoking `powershell`.
|
||||
|
||||
-- vcpkg team <vcpkg@microsoft.com> WED, 16 May 2018 19:00:00 -0800
|
||||
|
||||
|
||||
vcpkg (0.0.111)
|
||||
--------------
|
||||
* Add ports:
|
||||
- cmark 0.28.3-1
|
||||
- inja 1.0.0
|
||||
- libgo 2.7
|
||||
- range-v3-vs2015 20151130-vcpkg5
|
||||
- restinio 0.4.5.1
|
||||
- treehopper 1.11.3-1
|
||||
- yajl 2.1.0-1
|
||||
- yato 1.0-1
|
||||
* Update ports:
|
||||
- abseil 2018-04-12 -> 2018-04-25-1
|
||||
- alembic 1.7.7 -> 1.7.8
|
||||
- aws-sdk-cpp 1.4.33 -> 1.4.38
|
||||
- bigint 2010.04.30-1 -> 2010.04.30-2
|
||||
- box2d 2.3.1-374664b -> 2.3.1-374664b-1
|
||||
- brotli 1.0.2-1 -> 1.0.2-2
|
||||
- cgal 4.11.1 -> 4.12
|
||||
- corrade 2018.02-1 -> 2018.04-1
|
||||
- directxmesh feb2018-eb751e0b631b05aa25c36c08e7d6bbf09f5e94a9 -> apr2018
|
||||
- directxtex feb2018b -> apr2018
|
||||
- directxtk feb2018 -> apr2018
|
||||
- discord-rpc 3.2.0 -> 3.3.0
|
||||
- exiv2 2018-04-12 -> 2018-04-25
|
||||
- exprtk 2018.01.01-f32d2b4 -> 2018.04.30-46877b6
|
||||
- folly 2018.04.16.00 -> 2018.04.23.00
|
||||
- freeglut 3.0.0-3 -> 3.0.0-4
|
||||
- gainput 1.0.0 -> 1.0.0-1
|
||||
- geos 3.6.2-2 -> 3.6.2-3
|
||||
- http-parser 2.7.1-2 -> 2.7.1-3
|
||||
- imgui 1.53 -> 1.60
|
||||
- ismrmrd 1.3.2-1 -> 1.3.2-2
|
||||
- jsonnet 2018-04-17 -> 2018-04-25
|
||||
- leveldb 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-1 -> 2017-10-25-8b1cd3753b184341e837b30383832645135d3d73-2
|
||||
- libflac 1.3.2-4 -> 1.3.2-5
|
||||
- libqrencode 4.0.0-1 -> 4.0.0-2
|
||||
- libuv 1.20.0 -> 1.20.2
|
||||
- libxmlpp 2.40.1-1 -> 2.40.1-2
|
||||
- llvm 6.0.0 -> 6.0.0-1
|
||||
- magnum 2018.02-2 -> 2018.04-1
|
||||
- magnum-extras 2018.02-2 -> 2018.04-1
|
||||
- magnum-integration 2018.02-1 -> 2018.04-1
|
||||
- magnum-plugins 2018.02-2 -> 2018.04-1
|
||||
- ms-gsl 2018-03-17 -> 2018-04-25
|
||||
- nuklear 2018-04-17 -> 2018-04-25
|
||||
- openal-soft 1.18.2-1 -> 1.18.2-2
|
||||
- physfs 2.0.3-2 -> 3.0.1
|
||||
- poco 1.8.1-1 -> 1.9.0
|
||||
- python3 3.6.4 -> 3.6.4-1
|
||||
- quirc 1.0-1 -> 1.0-2
|
||||
- range-v3 20151130-vcpkg5 -> 0.3.5
|
||||
- rapidjson 1.1.0 -> 1.1.0-1
|
||||
- realsense2 2.10.1-1 -> 2.10.4
|
||||
- rhash 1.3.5-1 -> 1.3.6
|
||||
- rocksdb 5.12.2 -> 5.12.4
|
||||
- rs-core-lib 2018-04-12 -> 2018-04-25
|
||||
- sciter 4.1.5 -> 4.1.7
|
||||
- sfml 2.4.2-2 -> 2.4.2-3
|
||||
- sobjectizer 5.5.21 -> 5.5.22
|
||||
- sol 2.19.5 -> 2.20.0
|
||||
- sqlite3 3.23.0 -> 3.23.1-1
|
||||
- strtk 2018.01.01-5579ed1 -> 2018.05.07-48c9554
|
||||
- thrift 2018-04-17 -> 2018-04-25
|
||||
- unicorn 2018-03-20 -> 2018-04-25
|
||||
- uwebsockets 0.14.7-1 -> 0.14.8-1
|
||||
- vlpp 0.9.3.1 -> 0.9.3.1-1
|
||||
- zeromq 2018-04-17 -> 2018-04-25
|
||||
- zstd 1.3.3 -> 1.3.4
|
||||
* Add clean patching for vcpkg_from_github()
|
||||
- `vcpkg_from_github()` now takes a PATCHES argument (see the azure-storage-cpp [portfile](ports\azure-storage-cpp\portfile.cmake) as an example)
|
||||
- A unique directory name is derived from the source hash and the patch hashes
|
||||
- Modifying the patches would previously cause the new patches to fail to apply if sources with a previous version of the patches were present in the buildtrees. This is no longer the case.
|
||||
* Fix various cross-platform issues
|
||||
|
||||
-- vcpkg team <vcpkg@microsoft.com> FRI, 11 May 2018 21:45:00 -0800
|
||||
|
||||
|
||||
vcpkg (0.0.110)
|
||||
--------------
|
||||
* `vcpkg` is now available for Linux and MacOS. More information [here](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/).
|
||||
|
||||
20
README.md
20
README.md
@ -1,7 +1,7 @@
|
||||
# Vcpkg <a href="#"></a>
|
||||
# Vcpkg
|
||||
|
||||
## Overview
|
||||
Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This tool and ecosystem are currently in a preview state; your involvement is vital to its success!
|
||||
Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This tool and ecosystem are constantly evolving; your involvement is vital to its success!
|
||||
|
||||
For short description of available commands, run `vcpkg help`.
|
||||
|
||||
@ -10,34 +10,34 @@ Prerequisites:
|
||||
- Windows 10, 8.1, 7, Linux, or MacOS
|
||||
- Visual Studio 2017 or Visual Studio 2015 Update 3 (on Windows)
|
||||
- Git
|
||||
- *Optional: CMake 3.10.2*
|
||||
- *Optional:* CMake 3.12.4
|
||||
|
||||
To get started:
|
||||
```
|
||||
> git clone https://github.com/Microsoft/vcpkg
|
||||
> git clone https://github.com/Microsoft/vcpkg.git
|
||||
> cd vcpkg
|
||||
|
||||
PS> .\bootstrap-vcpkg.bat
|
||||
Ubuntu:~/$ ./bootstrap-vcpkg.sh
|
||||
Linux:~/$ ./bootstrap-vcpkg.sh
|
||||
```
|
||||
|
||||
Then, to hook up user-wide integration, run (note: requires admin on first use)
|
||||
Then, to hook up user-wide [integration](docs/users/integration.md), run (note: requires admin on first use)
|
||||
```
|
||||
PS> .\vcpkg integrate install
|
||||
Ubuntu:~/$ ./vcpkg integrate install
|
||||
Linux:~/$ ./vcpkg integrate install
|
||||
```
|
||||
|
||||
Install any packages with
|
||||
```
|
||||
PS> .\vcpkg install sdl2 curl
|
||||
Ubuntu:~/$ ./vcpkg install sdl2 curl
|
||||
Linux:~/$ ./vcpkg install sdl2 curl
|
||||
```
|
||||
|
||||
The best way to use installed libraries with CMake is via the toolchain file `scripts\buildsystems\vcpkg.cmake`. To use this file, you simply need to add it onto your CMake command line as `-DCMAKE_TOOLCHAIN_FILE=[vcpkg root]\scripts\buildsystems\vcpkg.cmake`.
|
||||
|
||||
In Visual Studio, you can create a New Project (or open an existing one). All installed libraries are immediately ready to be `#include`'d and used in your project without additional configuration.
|
||||
|
||||
For more information, see our [using a package](docs/examples/using-sqlite.md) example for the specifics.
|
||||
For more information, see our [using a package](docs/examples/installing-and-using-packages.md) example for the specifics.
|
||||
|
||||
Additional notes on macOS and Linux support can be found in the [official announcement](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/).
|
||||
|
||||
@ -50,7 +50,7 @@ and restart Powershell.
|
||||
|
||||
|
||||
## Examples
|
||||
See the [documentation](docs/index.md) for specific walkthroughs, including [using a package](docs/examples/using-sqlite.md) and [adding a new package](docs/examples/packaging-zlib.md).
|
||||
See the [documentation](docs/index.md) for specific walkthroughs, including [installing and using a package](docs/examples/installing-and-using-packages.md), [adding a new package from a zipfile](docs/examples/packaging-zipfiles.md), and [adding a new package from a GitHub repo](docs/examples/packaging-github-repos.md).
|
||||
|
||||
Our docs are now also available online at ReadTheDocs: <https://vcpkg.readthedocs.io/>!
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
@echo off
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass "& {& '%~dp0scripts\bootstrap.ps1'}"
|
||||
powershell.exe -NoProfile -ExecutionPolicy Bypass "& {& '%~dp0scripts\bootstrap.ps1' %*}"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P)
|
||||
. $vcpkgRootDir/scripts/bootstrap.sh
|
||||
. "$vcpkgRootDir/scripts/bootstrap.sh"
|
||||
|
||||
@ -10,12 +10,12 @@ Yes! See [the `export` command](../users/integration.md#export).
|
||||
The `vcpkg update` command lists all packages which are out-of-sync with your current portfiles. To update a package, follow the instructions in the command.
|
||||
|
||||
## How do I get more libraries?
|
||||
The list of libraries is enumerated from the [`ports\`](https://github.com/Microsoft/vcpkg/blob/master/ports) directory. By design, you can add and remove libraries from this directory as you see fit for yourself or your company -- see [Example #2](../examples/packaging-zlib.md).
|
||||
The list of libraries is enumerated from the [`ports\`](https://github.com/Microsoft/vcpkg/blob/master/ports) directory. By design, you can add and remove libraries from this directory as you see fit for yourself or your company -- see our examples on packaging [zipfiles](../examples/packaging-zipfiles.md) and [GitHub repos](../examples/packaging-github-repos.md).
|
||||
|
||||
We recommend cloning directly from [GitHub](https://github.com/microsoft/vcpkg) and using `git pull` to update the list of portfiles. Once you've updated your portfiles, `vcpkg update` will indicate any installed libraries that are now out of date.
|
||||
|
||||
## Can I build a private library with this tool?
|
||||
Yes. Follow [our Packaging zlib Example](../examples/packaging-zlib.md) for creating a portfile using a fake URL. Then, either pre-seed the `downloads\` folder with a zip containing your private sources or replace the normal calls to `vcpkg_download_distfile` and `vcpkg_extract_source_archive` with functions that unpack your source code.
|
||||
Yes. Follow [our packaging zlib Example](../examples/packaging-zipfiles.md) for creating a portfile using a fake URL. Then, either pre-seed the `downloads\` folder with a zip containing your private sources or replace the normal calls to `vcpkg_download_distfile` and `vcpkg_extract_source_archive` with functions that unpack your source code.
|
||||
|
||||
## Can I use a prebuilt private library with this tool?
|
||||
Yes. The `portfile.cmake` for a library is fundamentally a script that places the headers and binaries into the correct arrangement in the `${CURRENT_PACKAGES_DIR}`, so to pull in prebuilt binaries you can write a portfile which directly downloads and arranges the files.
|
||||
@ -26,7 +26,7 @@ To see an example of this, look at [`ports\opengl\portfile.cmake`](https://githu
|
||||
We currently target Windows Desktop (x86 and x64) as well as the Universal Windows Platform (x86, x64, and ARM). See `vcpkg help triplet` for the current list.
|
||||
|
||||
## Does Vcpkg run on Linux/OSX?
|
||||
No, for this preview we are focusing on Windows as a host platform. If you'd be interested in having Vcpkg run on Linux or OSX, please let us know in [this issue](https://github.com/microsoft/vcpkg/issues/57)!
|
||||
Yes! We continously test on OSX and Ubuntu 16.04, however we know users have been successful with Arch, Fedora, and FreeBSD. If you have trouble with your favorite Linux distribution, let us know in an issue and we'd be happy to help!
|
||||
|
||||
## How do I use different versions of a library on one machine?
|
||||
Within a single instance of Vcpkg (e.g. one set of `installed\`, `packages\`, `ports\` and so forth), you can only have one version of a library installed (otherwise, the headers would conflict with each other!). For those with experience with system-wide package managers, packages in Vcpkg correspond to the `X-dev` or `X-devel` packages.
|
||||
@ -35,14 +35,14 @@ To use different versions of a library for different projects, we recommend maki
|
||||
|
||||
If your application is very sensitive to the versions of libraries, we recommend checking in the specific set of portfiles you need into your source control along with your project sources and using the `--vcpkg-root` option to redirect the working directory of `vcpkg.exe`.
|
||||
|
||||
## How does Vcpkg protect my Privacy?
|
||||
## How does Vcpkg protect my privacy?
|
||||
See the [Privacy document](privacy.md) for all information regarding privacy.
|
||||
|
||||
## Can I use my own CMake toolchain file with Vcpkg's toolchain file?
|
||||
Yes. If you already have a CMake toolchain file, you will need to include our toolchain file at the end of yours. This should be as simple as an `include(<vcpkg_root>\scripts\buildsystems\vcpkg.cmake)` directive. Alternatively, you could copy the contents of our `scripts\buildsystems\vcpkg.cmake` into the end of your existing toolchain file.
|
||||
|
||||
## Can I use my own/specific flags for rebuilding libs?
|
||||
Yes. In the current preview, there is not yet a standardized global way to change them, however you can edit individual portfiles and tweak the exact build process however you'd like.
|
||||
Yes. In the current version, there is not yet a standardized global way to change them, however you can edit individual portfiles and tweak the exact build process however you'd like.
|
||||
|
||||
By saving the changes to the portfile (and checking them in), you'll get the same results even if you're rebuilding from scratch in the future and forgot what exact settings you used.
|
||||
|
||||
@ -93,7 +93,7 @@ Enabling user-wide integration (`vcpkg integrate install`) changes the default f
|
||||
## Why not NuGet?
|
||||
NuGet is a package manager for .NET libraries with a strong dependency on MSBuild. It does not meet the specific needs of Native C++ customers in at least three ways.
|
||||
|
||||
- **Compilation Flavors**. With so many possible combinations of compilation options, the task of providing a truly complete set of options is intrinsicly impossible. Furthermore, the download size for reasonably complete binary packages becomes enormous. This makes it a requirement to split the results into multiple packages, but then searching becomes very difficult.
|
||||
- **Compilation Flavors**. With so many possible combinations of compilation options, the task of providing a truly complete set of options is intrinsically impossible. Furthermore, the download size for reasonably complete binary packages becomes enormous. This makes it a requirement to split the results into multiple packages, but then searching becomes very difficult.
|
||||
|
||||
- **Binary vs Source**. Very closely tied to the first point, NuGet is designed from the ground up to provide relatively small, prebuilt binaries. Due to the nature of native code, developers need to have access to the source code to ensure ABI compatibility, performance, integrity, and debuggability.
|
||||
|
||||
@ -108,7 +108,7 @@ Conan.io is a publicly-federated, project-centric, cross-platform, C++ package m
|
||||
|
||||
- **Cross-platform vs single-platform**. While being hosted on many platforms is an excellent north star, we believe the level of system integration and stability provided by apt-get, yum, and homebrew is well worth needing to exchange `apt-get install libboost-all-dev` with `brew install boost` in automated scripts. We chose to make our system as easy as possible to integrate into a world with these very successful system managers -- one more line for `vcpkg install boost` -- instead of attempting to replace them where they are already so successful and well-loved.
|
||||
|
||||
- **C++/CMake vs python**. While Python is an excellent language loved by many, we believe that transparency and familiarity are the most important factors when choosing a tool as important to your workflow as a package manager. Consequently, we chose to make the implementation languages be as universally accepted as possible: C++ should be used in a C++ package manager for C++ programmers. You should not be required to learn another language just to understand your package manager.
|
||||
- **C++/CMake vs python**. While Python is an excellent language loved by many, we believe that transparency and familiarity are the most important factors when choosing a tool as important to your workflow as a package manager. Consequently, we chose to make the implementation languages be as universally accepted as possible: C++ should be used in a C++ package manager for C++ programmers. You should not be required to learn another programming language just to understand your package manager.
|
||||
|
||||
## Why not Chocolatey?
|
||||
Chocolatey is an excellent system for managing applications. However, it is not currently designed to acquire redistributable developer assets and help you with debugging. Vcpkg, in comparison, is designed to get you the libraries you need to build your application and help you deliver through any platform you'd like (including Chocolatey!).
|
||||
|
||||
@ -7,7 +7,14 @@ We do collect telemetry data from usage of "vcpkg.exe". We explicitly ONLY colle
|
||||
|
||||
## What telemetry is collected?
|
||||
|
||||
We collect the command line used, the time of invocation, and how long the command took. Some commands also add additional calculated information (such as the full set of libraries to install). We generate a completely random UUID on first use and attach it to each event. For this preview, we do not offer a mechanism to disable this data collection since it is critical for improving the product. In the full release, you will be able to opt-out with a simple configuration. For more information about how Microsoft protects your privacy, see https://privacy.microsoft.com/en-us/privacy.
|
||||
We collect the command line used, the time of invocation, and how long execution took. Some commands also add additional calculated information (such as the full set of libraries to install). We generate a completely random UUID on first use and attach it to each event.
|
||||
In order to opt-out of data collection, you can re-run the boostrap script with the following flag, for Windows and Linux/OSX, respectively:
|
||||
|
||||
```PS> .\bootstrap-vcpkg.bat -disableMetrics```
|
||||
|
||||
```~/$ ./bootstrap-vcpkg.sh -disableMetrics```
|
||||
|
||||
For more information about how Microsoft protects your privacy, see https://privacy.microsoft.com/en-us/privacy.
|
||||
|
||||
Here is an example of an event for the command line `vcpkg install zlib`:
|
||||
```json
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Example: Using Sqlite
|
||||
## Installing and Using Packages Example: SQLite
|
||||
|
||||
- [Step 1: Install](#install)
|
||||
- [Step 2: Use](#use)
|
||||
@ -10,7 +10,7 @@
|
||||
<a name="install"></a>
|
||||
## Step 1: Install
|
||||
|
||||
First, we need to know what name [Sqlite](https://sqlite.org) goes by in the ports tree. To do that, we'll run the `search` command and inspect the output:
|
||||
First, we need to know what name [SQLite](https://sqlite.org) goes by in the ports tree. To do that, we'll run the `search` command and inspect the output:
|
||||
```no-highlight
|
||||
PS D:\src\vcpkg> .\vcpkg search sqlite
|
||||
libodb-sqlite 2.4.0 Sqlite support for the ODB ORM library
|
||||
@ -71,7 +71,7 @@ See `.\vcpkg help triplet` for all supported targets.
|
||||
<a name="msbuild"></a>
|
||||
#### VS/MSBuild Project (User-wide integration)
|
||||
|
||||
The recommended and most productive way to use vcpkg is via user-wide integration, making the system available for all projects you build. The user-wide integration will prompt for administrator access the first time it is used on a given machine, but afterwords is no longer required and the integration is configured on a per-user basis.
|
||||
The recommended and most productive way to use vcpkg is via user-wide integration, making the system available for all projects you build. The user-wide integration will prompt for administrator access the first time it is used on a given machine, but afterwards is no longer required and the integration is configured on a per-user basis.
|
||||
```no-highlight
|
||||
PS D:\src\vcpkg> .\vcpkg integrate install
|
||||
Applied user-wide integration for this vcpkg root.
|
||||
@ -82,7 +82,7 @@ Installing new libraries will make them instantly available.
|
||||
```
|
||||
*Note: You will need to restart Visual Studio or perform a Build to update intellisense with the changes.*
|
||||
|
||||
You can now simply use File -> New Project in Visual Studio 2015 or Visual Studio 2017 and the library will be automatically available. For Sqlite, you can try out their [C/C++ sample](https://sqlite.org/quickstart.html).
|
||||
You can now simply use File -> New Project in Visual Studio 2015 or Visual Studio 2017 and the library will be automatically available. For SQLite, you can try out their [C/C++ sample](https://sqlite.org/quickstart.html).
|
||||
|
||||
To remove the integration for your user, you can use `.\vcpkg integrate remove`.
|
||||
|
||||
59
docs/examples/packaging-github-repos.md
Normal file
59
docs/examples/packaging-github-repos.md
Normal file
@ -0,0 +1,59 @@
|
||||
## Packaging Github Repos Example: libogg
|
||||
### Create the CONTROL file
|
||||
The `CONTROL` file is a simple set of fields describing the package's metadata.
|
||||
|
||||
*For libogg, we'll create the file `ports\libogg\CONTROL` with the following contents:*
|
||||
```no-highlight
|
||||
Source: libogg
|
||||
Version: 1.3.3
|
||||
Description: Ogg is a multimedia container format, and the native file and stream format for the Xiph.org multimedia codecs.
|
||||
```
|
||||
|
||||
### Create the portfile
|
||||
`portfile.cmake` describes how to build and install the package. First we include `vcpkg_common_functions` to give us utilities for carrying this out:
|
||||
|
||||
```no-highlight
|
||||
include(vcpkg_common_functions)
|
||||
```
|
||||
|
||||
Now we download the project from Github with [`vcpkg_from_github`](../maintainers/vcpkg_from_github.md):
|
||||
|
||||
```no-highlight
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO xiph/ogg
|
||||
REF v1.3.3
|
||||
SHA512 0bd6095d647530d4cb1f509eb5e99965a25cc3dd9b8125b93abd6b248255c890cf20710154bdec40568478eb5c4cde724abfb2eff1f3a04e63acef0fbbc9799b
|
||||
HEAD_REF master
|
||||
)
|
||||
```
|
||||
|
||||
The important parts to update are `REPO` for the GitHub repository path, `REF` for a stable tag/commit to use, and `SHA512` with the checksum of the downloaded zipfile (you can get this easily by setting it to `1`, trying to install the package, and copying the checksum).
|
||||
|
||||
Finally, we configure the project with CMake, install the package, and copy over the license file:
|
||||
|
||||
```no-highlight
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
)
|
||||
vcpkg_install_cmake()
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libogg RENAME copyright)
|
||||
```
|
||||
|
||||
Check the documentation for [`vcpkg_configure_cmake`](../maintainers/vcpkg_configure_cmake.md) and [`vcpkg_install_cmake`](../maintainers/vcpkg_install_cmake.md) if your package needs additional options.
|
||||
|
||||
Now you can run `vcpkg install libogg` to build and install the package.
|
||||
|
||||
### Suggested example portfiles
|
||||
In the `ports\` directory are many libraries that can be used as examples, including many that are not based on CMake.
|
||||
|
||||
- Header only libraries
|
||||
- rapidjson
|
||||
- range-v3
|
||||
- MSBuild-based
|
||||
- cppunit
|
||||
- mpg123
|
||||
- Non-CMake, custom buildsystem
|
||||
- openssl
|
||||
- ffmpeg
|
||||
@ -1,9 +1,9 @@
|
||||
## Example 2: Packaging zlib
|
||||
## Packaging Zipfiles Example: zlib
|
||||
|
||||
### Bootstrap with `create`
|
||||
First, locate a globally accessible archive of the library's sources. Zip, gzip, and bzip are all supported. Strongly prefer official sources or mirrors over unofficial mirrors.
|
||||
|
||||
*Looking at zlib's website, the URL http://zlib.net/zlib128.zip looks appropriate.*
|
||||
*Looking at zlib's website, the URL http://zlib.net/zlib1211.zip looks appropriate.*
|
||||
|
||||
Second, determine a suitable package name. This should be ASCII, lowercase, and recognizable to someone who knows the library's "human name". If the library is already packaged in another package manager, prefer that name.
|
||||
|
||||
@ -11,7 +11,7 @@ Second, determine a suitable package name. This should be ASCII, lowercase, and
|
||||
|
||||
Finally, if the server's name for the archive is not very descriptive (such as downloading a zipped commit or branch from GitHub), choose a nice archive name of the form `<packagename>-<version>.zip`.
|
||||
|
||||
*`zlib128.zip` is a fine name, so no change needed.*
|
||||
*`zlib1211.zip` is a fine name, so no change needed.*
|
||||
|
||||
All this information can then be passed into the `create` command, which will download the sources and bootstrap the packaging process inside `ports\<packagename>`.
|
||||
|
||||
@ -21,12 +21,12 @@ PS D:\src\vcpkg> .\vcpkg create zlib2 http://zlib.net/zlib-1.2.11.tar.gz zlib-1.
|
||||
```
|
||||
|
||||
### Create the CONTROL file
|
||||
In addition to the generated `ports\<package>\portfile.cmake`, we also need a `ports\<package>\CONTROL` file. This file is a simply formatted set of fields describing the package's metadata.
|
||||
In addition to the generated `ports\<package>\portfile.cmake`, we also need a `ports\<package>\CONTROL` file. This file is a simple set of fields describing the package's metadata.
|
||||
|
||||
*For zlib2, we'll create the file `ports\zlib2\CONTROL` with the following contents:*
|
||||
```no-highlight
|
||||
Source: zlib2
|
||||
Version: 1.2.8
|
||||
Version: 1.2.11
|
||||
Description: A Massively Spiffy Yet Delicately Unobtrusive Compression Library
|
||||
```
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
## Example 3: Patching libpng to work for x86-uwp
|
||||
## Patching Example: Patching libpng to work for x86-uwp
|
||||
|
||||
### Initial error logs
|
||||
First, try building:
|
||||
@ -1,14 +1,15 @@
|
||||
### Quick Start
|
||||
|
||||
Vcpkg helps you get C and C++ libraries on Windows. This tool and ecosystem are currently in a preview state; your involvement is vital to its success.
|
||||
Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This tool and ecosystem are constantly evolving; your involvement are vital to its success!
|
||||
|
||||
- [How to use Sqlite in your application](examples/using-sqlite.md)
|
||||
- [Installing and Using Packages Example: sqlite](examples/installing-and-using-packages.md)
|
||||
|
||||
### Examples
|
||||
|
||||
- [Example 1: Using Sqlite](examples/using-sqlite.md)
|
||||
- [Example 2: Packaging zlib](examples/packaging-zlib.md)
|
||||
- [Example 3: Patching libpng for x86-uwp](examples/patching-libpng.md)
|
||||
- [Installing and Using Packages Example: sqlite](examples/installing-and-using-packages.md)
|
||||
- [Packaging Zipfiles Example: zlib](examples/packaging-zipfiles.md)
|
||||
- [Packaging GitHub Repositories Example: libogg](examples/packaging-github-repos.md)
|
||||
- [Patching Example: Patching libpng to work for x86-uwp](examples/patching.md)
|
||||
|
||||
### User Help
|
||||
|
||||
@ -26,6 +27,7 @@ Vcpkg helps you get C and C++ libraries on Windows. This tool and ecosystem are
|
||||
|
||||
### Blog posts
|
||||
- [Announcing a single C++ library manager for Linux, macOS and Windows: Vcpkg](https://blogs.msdn.microsoft.com/vcblog/2018/04/24/announcing-a-single-c-library-manager-for-linux-macos-and-windows-vcpkg/)
|
||||
- [Vcpkg: Using multiple enlistments to handle multiple versions of a library](https://blogs.msdn.microsoft.com/vcblog/2017/10/23/vcpkg-using-multiple-enlistments/)
|
||||
- [Vcpkg: introducing the export command](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/)
|
||||
- [Binary Compatibility and Pain-free Upgrade Why Moving to Visual Studio 2017 is almost "too easy"](https://blogs.msdn.microsoft.com/vcblog/2017/03/07/binary-compatibility-and-pain-free-upgrade-why-moving-to-visual-studio-2017-is-almost-too-easy/)
|
||||
- [Vcpkg recent enhancements](https://blogs.msdn.microsoft.com/vcblog/2017/02/14/vcpkg-recent-enhancements/)
|
||||
|
||||
@ -2,16 +2,24 @@
|
||||
|
||||
# Portfile helper functions
|
||||
- [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md)
|
||||
- [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\_check\_linkage](vcpkg_check_linkage.md)
|
||||
- [vcpkg\_clean\_msbuild](vcpkg_clean_msbuild.md)
|
||||
- [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md)
|
||||
- [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md)
|
||||
- [vcpkg\_copy\_tool\_dependencies](vcpkg_copy_tool_dependencies.md)
|
||||
- [vcpkg\_download\_distfile](vcpkg_download_distfile.md)
|
||||
- [vcpkg\_execute\_required\_process](vcpkg_execute_required_process.md)
|
||||
- [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md)
|
||||
- [vcpkg\_extract\_source\_archive\_ex](vcpkg_extract_source_archive_ex.md)
|
||||
- [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md)
|
||||
- [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md)
|
||||
- [vcpkg\_from\_git](vcpkg_from_git.md)
|
||||
- [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\_test\_cmake](vcpkg_test_cmake.md)
|
||||
|
||||
20
docs/maintainers/vcpkg_add_to_path.md
Normal file
20
docs/maintainers/vcpkg_add_to_path.md
Normal file
@ -0,0 +1,20 @@
|
||||
# vcpkg_add_to_path
|
||||
|
||||
Add a directory to the PATH environment variable
|
||||
|
||||
## Usage
|
||||
```cmake
|
||||
vcpkg_add_to_path([PREPEND] <${PYTHON3_DIR}>)
|
||||
```
|
||||
|
||||
## Parameters
|
||||
### <positional>
|
||||
The directory to add
|
||||
|
||||
### PREPEND
|
||||
Prepends the directory.
|
||||
|
||||
The default is to append.
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_add_to_path.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_add_to_path.cmake)
|
||||
@ -15,6 +15,9 @@ The underlying buildsystem will be instructed to not parallelize
|
||||
The target passed to the cmake build command (`cmake --build . --target <target>`). 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_cmake()`](vcpkg_configure_cmake.md).
|
||||
You can use the alias [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# vcpkg_build_msbuild
|
||||
|
||||
Build an msbuild-based project.
|
||||
Build an msbuild-based project. Deprecated in favor of `vcpkg_install_msbuild()`.
|
||||
|
||||
## Usage
|
||||
```cmake
|
||||
@ -15,6 +15,7 @@ vcpkg_build_msbuild(
|
||||
[OPTIONS </p:ZLIB_INCLUDE_PATH=X>...]
|
||||
[OPTIONS_RELEASE </p:ZLIB_LIB=X>...]
|
||||
[OPTIONS_DEBUG </p:ZLIB_LIB=X>...]
|
||||
[USE_VCPKG_INTEGRATION]
|
||||
)
|
||||
```
|
||||
|
||||
|
||||
34
docs/maintainers/vcpkg_check_linkage.md
Normal file
34
docs/maintainers/vcpkg_check_linkage.md
Normal file
@ -0,0 +1,34 @@
|
||||
# vcpkg_check_linkage
|
||||
|
||||
Asserts the available library and CRT linkage options for the port.
|
||||
|
||||
## Usage
|
||||
```cmake
|
||||
vcpkg_check_linkage(
|
||||
[ONLY_STATIC_LIBRARY | ONLY_DYNAMIC_LIBRARY]
|
||||
[ONLY_STATIC_CRT | ONLY_DYNAMIC_CRT]
|
||||
)
|
||||
```
|
||||
|
||||
## Parameters
|
||||
### ONLY_STATIC_LIBRARY
|
||||
Indicates that this port can only be built with static library linkage.
|
||||
|
||||
### ONLY_DYNAMIC_LIBRARY
|
||||
Indicates that this port can only be built with dynamic/shared library linkage.
|
||||
|
||||
### ONLY_STATIC_CRT
|
||||
Indicates that this port can only be built with static CRT linkage.
|
||||
|
||||
### ONLY_DYNAMIC_CRT
|
||||
Indicates that this port can only be built with dynamic/shared CRT linkage.
|
||||
|
||||
## Notes
|
||||
This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail, depending on what was requested by the user versus what the library supports.
|
||||
|
||||
## Examples
|
||||
|
||||
* [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake)
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_check_linkage.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_check_linkage.cmake)
|
||||
15
docs/maintainers/vcpkg_clean_msbuild.md
Normal file
15
docs/maintainers/vcpkg_clean_msbuild.md
Normal file
@ -0,0 +1,15 @@
|
||||
# vcpkg_clean_msbuild
|
||||
|
||||
Clean intermediate files generated by `vcpkg_install_msbuild()`.
|
||||
|
||||
## Usage
|
||||
```cmake
|
||||
vcpkg_clean_msbuild()
|
||||
```
|
||||
|
||||
## Examples
|
||||
|
||||
* [xalan-c](https://github.com/Microsoft/vcpkg/blob/master/ports/xalan-c/portfile.cmake)
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_clean_msbuild.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_clean_msbuild.cmake)
|
||||
@ -4,12 +4,18 @@ Automatically locate pdbs in the build tree and copy them adjacent to all DLLs.
|
||||
|
||||
## Usage
|
||||
```cmake
|
||||
vcpkg_copy_pdbs()
|
||||
vcpkg_copy_pdbs([BUILD_PATHS <${CURRENT_PACKAGES_DIR}/bin/*.dll> ...])
|
||||
```
|
||||
|
||||
## Notes
|
||||
This command should always be called by portfiles after they have finished rearranging the binary output.
|
||||
|
||||
## Parameters
|
||||
### BUILD_PATHS
|
||||
Path patterns passed to `file(GLOB_RECURSE)` for locating dlls.
|
||||
|
||||
Defaults to `${CURRENT_PACKAGES_DIR}/bin/*.dll` and `${CURRENT_PACKAGES_DIR}/debug/bin/*.dll`.
|
||||
|
||||
## Examples
|
||||
|
||||
* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# vcpkg_extract_source_archive
|
||||
|
||||
Extract an archive into the source directory.
|
||||
Extract an archive into the source directory. Deprecated in favor of [`vcpkg_extract_source_archive_ex`](vcpkg_extract_source_archive_ex.md).
|
||||
|
||||
## Usage
|
||||
```cmake
|
||||
|
||||
52
docs/maintainers/vcpkg_extract_source_archive_ex.md
Normal file
52
docs/maintainers/vcpkg_extract_source_archive_ex.md
Normal file
@ -0,0 +1,52 @@
|
||||
# vcpkg_extract_source_archive_ex
|
||||
|
||||
Extract an archive into the source directory. Replaces [`vcpkg_extract_source_archive`](vcpkg_extract_source_archive.md).
|
||||
|
||||
## Usage
|
||||
```cmake
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH <SOURCE_PATH>
|
||||
ARCHIVE <${ARCHIVE}>
|
||||
[REF <1.0.0>]
|
||||
[NO_REMOVE_ONE_LEVEL]
|
||||
[WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/src>]
|
||||
[PATCHES <a.patch>...]
|
||||
)
|
||||
```
|
||||
## Parameters
|
||||
### OUT_SOURCE_PATH
|
||||
Specifies the out-variable that will contain the extracted location.
|
||||
|
||||
This should be set to `SOURCE_PATH` by convention.
|
||||
|
||||
### ARCHIVE
|
||||
The full path to the archive to be extracted.
|
||||
|
||||
This is usually obtained from calling [`vcpkg_download_distfile`](vcpkg_download_distfile.md).
|
||||
|
||||
### REF
|
||||
A friendly name that will be used instead of the filename of the archive.
|
||||
|
||||
By convention, this is set to the version number or tag fetched
|
||||
|
||||
### WORKING_DIRECTORY
|
||||
If specified, the archive will be extracted into the working directory instead of `${CURRENT_BUILDTREES_DIR}/src/`.
|
||||
|
||||
Note that the archive will still be extracted into a subfolder underneath that directory (`${WORKING_DIRECTORY}/${REF}-${HASH}/`).
|
||||
|
||||
### PATCHES
|
||||
A list of patches to be applied to the extracted sources.
|
||||
|
||||
Relative paths are based on the port directory.
|
||||
|
||||
### NO_REMOVE_ONE_LEVEL
|
||||
Specifies that the default removal of the top level folder should not occur.
|
||||
|
||||
## Examples
|
||||
|
||||
* [bzip2](https://github.com/Microsoft/vcpkg/blob/master/ports/bzip2/portfile.cmake)
|
||||
* [sqlite3](https://github.com/Microsoft/vcpkg/blob/master/ports/sqlite3/portfile.cmake)
|
||||
* [cairo](https://github.com/Microsoft/vcpkg/blob/master/ports/cairo/portfile.cmake)
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_extract_source_archive_ex.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_extract_source_archive_ex.cmake)
|
||||
@ -25,6 +25,7 @@ The current list of programs includes:
|
||||
- NASM
|
||||
- NINJA
|
||||
- YASM
|
||||
- ARIA2 (Downloader)
|
||||
|
||||
Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md).
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@ vcpkg_from_bitbucket(
|
||||
[REF <v2.0.0>]
|
||||
[SHA512 <45d0d7f8cc350...>]
|
||||
[HEAD_REF <master>]
|
||||
[PATCHES <patch1.patch> <patch2.patch>...]
|
||||
)
|
||||
```
|
||||
|
||||
@ -40,6 +41,11 @@ The unstable git commit-ish (ideally a branch) to pull for `--head` builds.
|
||||
|
||||
For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms.
|
||||
|
||||
### PATCHES
|
||||
A list of patches to be applied to the extracted sources.
|
||||
|
||||
Relative paths are based on the port directory.
|
||||
|
||||
## Notes:
|
||||
At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
|
||||
|
||||
|
||||
48
docs/maintainers/vcpkg_from_git.md
Normal file
48
docs/maintainers/vcpkg_from_git.md
Normal file
@ -0,0 +1,48 @@
|
||||
# vcpkg_from_git
|
||||
|
||||
Download and extract a project from git
|
||||
|
||||
## Usage:
|
||||
```cmake
|
||||
vcpkg_from_git(
|
||||
OUT_SOURCE_PATH <SOURCE_PATH>
|
||||
URL <https://android.googlesource.com/platform/external/fdlibm>
|
||||
REF <59f7335e4d...>
|
||||
SHA512 <abcdef123...>
|
||||
[PATCHES <patch1.patch> <patch2.patch>...]
|
||||
)
|
||||
```
|
||||
|
||||
## Parameters:
|
||||
### OUT_SOURCE_PATH
|
||||
Specifies the out-variable that will contain the extracted location.
|
||||
|
||||
This should be set to `SOURCE_PATH` by convention.
|
||||
|
||||
### URL
|
||||
The url of the git repository.
|
||||
|
||||
### SHA512
|
||||
The SHA512 hash that should match the archive form of the commit.
|
||||
|
||||
This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile.
|
||||
|
||||
### REF
|
||||
A stable git commit-ish (ideally a tag or commit) that will not change contents. **This should not be a branch.**
|
||||
|
||||
For repositories without official releases, this can be set to the full commit id of the current latest master.
|
||||
|
||||
### PATCHES
|
||||
A list of patches to be applied to the extracted sources.
|
||||
|
||||
Relative paths are based on the port directory.
|
||||
|
||||
## Notes:
|
||||
`OUT_SOURCE_PATH`, `REF`, `SHA512`, and `URL` must be specified.
|
||||
|
||||
## Examples:
|
||||
|
||||
* [fdlibm](https://github.com/Microsoft/vcpkg/blob/master/ports/fdlibm/portfile.cmake)
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_from_git.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_from_git.cmake)
|
||||
@ -10,6 +10,7 @@ vcpkg_from_github(
|
||||
[REF <v2.0.0>]
|
||||
[SHA512 <45d0d7f8cc350...>]
|
||||
[HEAD_REF <master>]
|
||||
[PATCHES <patch1.patch> <patch2.patch>...]
|
||||
)
|
||||
```
|
||||
|
||||
@ -23,7 +24,7 @@ This should be set to `SOURCE_PATH` by convention.
|
||||
The organization or user and repository on GitHub.
|
||||
|
||||
### REF
|
||||
A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.**
|
||||
A stable git commit-ish (ideally a tag or commit) that will not change contents. **This should not be a branch.**
|
||||
|
||||
For repositories without official releases, this can be set to the full commit id of the current latest master.
|
||||
|
||||
@ -39,6 +40,11 @@ The unstable git commit-ish (ideally a branch) to pull for `--head` builds.
|
||||
|
||||
For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms.
|
||||
|
||||
### PATCHES
|
||||
A list of patches to be applied to the extracted sources.
|
||||
|
||||
Relative paths are based on the port directory.
|
||||
|
||||
## Notes:
|
||||
At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
|
||||
|
||||
|
||||
61
docs/maintainers/vcpkg_from_gitlab.md
Normal file
61
docs/maintainers/vcpkg_from_gitlab.md
Normal file
@ -0,0 +1,61 @@
|
||||
# vcpkg_from_gitlab
|
||||
|
||||
Download and extract a project from Gitlab instances. Enables support for `install --head`.
|
||||
|
||||
## Usage:
|
||||
```cmake
|
||||
vcpkg_from_gitlab(
|
||||
GITLAB_URL <https://gitlab.com>
|
||||
OUT_SOURCE_PATH <SOURCE_PATH>
|
||||
REPO <gitlab-org/gitlab-ce>
|
||||
[REF <v10.7.3>]
|
||||
[SHA512 <45d0d7f8cc350...>]
|
||||
[HEAD_REF <master>]
|
||||
[PATCHES <patch1.patch> <patch2.patch>...]
|
||||
)
|
||||
```
|
||||
|
||||
## Parameters:
|
||||
|
||||
### GITLAB_URL
|
||||
The URL of the Gitlab instance to use.
|
||||
|
||||
### OUT_SOURCE_PATH
|
||||
Specifies the out-variable that will contain the extracted location.
|
||||
|
||||
This should be set to `SOURCE_PATH` by convention.
|
||||
|
||||
### REPO
|
||||
The organization or user plus the repository name on the Gitlab instance.
|
||||
|
||||
### REF
|
||||
A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.**
|
||||
|
||||
For repositories without official releases, this can be set to the full commit id of the current latest master.
|
||||
|
||||
If `REF` is specified, `SHA512` must also be specified.
|
||||
|
||||
### SHA512
|
||||
The SHA512 hash that should match the archive (${GITLAB_URL}/${REPO}/-/archive/${REF}/${REPO_NAME}-${REF}.tar.gz).
|
||||
The REPO_NAME variable is parsed from the value of REPO.
|
||||
|
||||
This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile.
|
||||
|
||||
### HEAD_REF
|
||||
The unstable git commit-ish (ideally a branch) to pull for `--head` builds.
|
||||
|
||||
For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms.
|
||||
|
||||
### PATCHES
|
||||
A list of patches to be applied to the extracted sources.
|
||||
|
||||
Relative paths are based on the port directory.
|
||||
|
||||
## Notes:
|
||||
At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
|
||||
|
||||
This exports the `VCPKG_HEAD_VERSION` variable during head builds.
|
||||
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_from_gitlab.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_from_gitlab.cmake)
|
||||
93
docs/maintainers/vcpkg_install_msbuild.md
Normal file
93
docs/maintainers/vcpkg_install_msbuild.md
Normal file
@ -0,0 +1,93 @@
|
||||
# vcpkg_install_msbuild
|
||||
|
||||
Build and install an msbuild-based project. This replaces `vcpkg_build_msbuild()`.
|
||||
|
||||
## Usage
|
||||
```cmake
|
||||
vcpkg_install_msbuild(
|
||||
SOURCE_PATH <${SOURCE_PATH}>
|
||||
PROJECT_SUBPATH <port.sln>
|
||||
[INCLUDES_SUBPATH <include>]
|
||||
[LICENSE_SUBPATH <LICENSE>]
|
||||
[RELEASE_CONFIGURATION <Release>]
|
||||
[DEBUG_CONFIGURATION <Debug>]
|
||||
[TARGET <Build>]
|
||||
[TARGET_PLATFORM_VERSION <10.0.15063.0>]
|
||||
[PLATFORM <${TRIPLET_SYSTEM_ARCH}>]
|
||||
[PLATFORM_TOOLSET <${VCPKG_PLATFORM_TOOLSET}>]
|
||||
[OPTIONS </p:ZLIB_INCLUDE_PATH=X>...]
|
||||
[OPTIONS_RELEASE </p:ZLIB_LIB=X>...]
|
||||
[OPTIONS_DEBUG </p:ZLIB_LIB=X>...]
|
||||
[USE_VCPKG_INTEGRATION]
|
||||
[ALLOW_ROOT_INCLUDES | REMOVE_ROOT_INCLUDES]
|
||||
)
|
||||
```
|
||||
|
||||
## Parameters
|
||||
### SOURCE_PATH
|
||||
The path to the root of the source tree.
|
||||
|
||||
Because MSBuild uses in-source builds, the source tree will be copied into a temporary location for the build. This
|
||||
parameter is the base for that copy and forms the base for all XYZ_SUBPATH options.
|
||||
|
||||
### USE_VCPKG_INTEGRATION
|
||||
Apply the normal `integrate install` integration for building the project.
|
||||
|
||||
By default, projects built with this command will not automatically link libraries or have header paths set.
|
||||
|
||||
### PROJECT_SUBPATH
|
||||
The subpath to the solution (`.sln`) or project (`.vcxproj`) file relative to `SOURCE_PATH`.
|
||||
|
||||
### LICENSE_SUBPATH
|
||||
The subpath to the license file relative to `SOURCE_PATH`.
|
||||
|
||||
### INCLUDES_SUBPATH
|
||||
The subpath to the includes directory relative to `SOURCE_PATH`.
|
||||
|
||||
This parameter should be a directory and should not end in a trailing slash.
|
||||
|
||||
### ALLOW_ROOT_INCLUDES
|
||||
Indicates that top-level include files (e.g. `include/zlib.h`) should be allowed.
|
||||
|
||||
### REMOVE_ROOT_INCLUDES
|
||||
Indicates that top-level include files (e.g. `include/Makefile.am`) should be removed.
|
||||
|
||||
### SKIP_CLEAN
|
||||
Indicates that the intermediate files should not be removed.
|
||||
|
||||
Ports using this option should later call [`vcpkg_clean_msbuild()`](vcpkg_clean_msbuild.md) to manually clean up.
|
||||
|
||||
### RELEASE_CONFIGURATION
|
||||
The configuration (``/p:Configuration`` msbuild parameter) used for Release builds.
|
||||
|
||||
### DEBUG_CONFIGURATION
|
||||
The configuration (``/p:Configuration`` msbuild parameter) used for Debug builds.
|
||||
|
||||
### TARGET_PLATFORM_VERSION
|
||||
The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter)
|
||||
|
||||
### TARGET
|
||||
The MSBuild target to build. (``/t:<TARGET>``)
|
||||
|
||||
### PLATFORM
|
||||
The platform (``/p:Platform`` msbuild parameter) used for the build.
|
||||
|
||||
### PLATFORM_TOOLSET
|
||||
The platform toolset (``/p:PlatformToolset`` msbuild parameter) used for the build.
|
||||
|
||||
### OPTIONS
|
||||
Additional options passed to msbuild for all builds.
|
||||
|
||||
### OPTIONS_RELEASE
|
||||
Additional options passed to msbuild for Release builds. These are in addition to `OPTIONS`.
|
||||
|
||||
### OPTIONS_DEBUG
|
||||
Additional options passed to msbuild for Debug builds. These are in addition to `OPTIONS`.
|
||||
|
||||
## Examples
|
||||
|
||||
* [xalan-c](https://github.com/Microsoft/vcpkg/blob/master/ports/xalan-c/portfile.cmake)
|
||||
* [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake)
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_install_msbuild.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_msbuild.cmake)
|
||||
20
docs/maintainers/vcpkg_test_cmake.md
Normal file
20
docs/maintainers/vcpkg_test_cmake.md
Normal file
@ -0,0 +1,20 @@
|
||||
# vcpkg_test_cmake
|
||||
|
||||
Tests a built package for CMake `find_package()` integration.
|
||||
|
||||
## Usage:
|
||||
```cmake
|
||||
vcpkg_test_cmake(PACKAGE_NAME <name> [MODULE])
|
||||
```
|
||||
|
||||
## Parameters:
|
||||
|
||||
### PACKAGE_NAME
|
||||
The expected name to find with `find_package()`.
|
||||
|
||||
### MODULE
|
||||
Indicates that the library expects to be found via built-in CMake targets.
|
||||
|
||||
|
||||
## Source
|
||||
[scripts/cmake/vcpkg_test_cmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_test_cmake.cmake)
|
||||
@ -35,15 +35,37 @@ cmake ../my/project -DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.c
|
||||
```
|
||||
Projects configured with the Vcpkg toolchain file will have the appropriate Vcpkg folders added to the cmake search paths. This makes all libraries available to be found through `find_package()`, `find_path()`, and `find_library()`.
|
||||
|
||||
See [Example: Using Sqlite](../examples/using-sqlite.md) for a fully worked example using our CMake toolchain.
|
||||
See [Installing and Using Packages Example: sqlite](../examples/installing-and-using-packages.md) for a fully worked example using our CMake toolchain.
|
||||
|
||||
Note that we do not automatically add ourselves to your compiler include paths. To use a header-only library, simply use `find_path()`, which will correctly work on all platforms:
|
||||
```cmake
|
||||
# To find and use catch
|
||||
find_path(CATCH_INCLUDE_DIR catch.hpp)
|
||||
find_path(CATCH_INCLUDE_DIR NAMES catch.hpp PATH_SUFFIXES catch2)
|
||||
include_directories(${CATCH_INCLUDE_DIR})
|
||||
```
|
||||
|
||||
##### Using an environment variable instead of a command line option
|
||||
|
||||
The `CMAKE_TOOLCHAIN_FILE` setting simply must be set before the `project()` directive is first called. This means that you can easily read from an environment variable to avoid passing it on the configure line:
|
||||
|
||||
```cmake
|
||||
if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
|
||||
set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
|
||||
CACHE STRING "")
|
||||
endif()
|
||||
|
||||
project(myproject CXX)
|
||||
```
|
||||
|
||||
##### Using multiple toolchain files
|
||||
|
||||
To use an external toolchain file with a project using vcpkg, you can set the cmake variable `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` on the configure line:
|
||||
```no-highlight
|
||||
cmake ../my/project \
|
||||
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \
|
||||
-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=../my/project/compiler-settings-toolchain.cmake
|
||||
```
|
||||
|
||||
#### Linking NuGet file
|
||||
|
||||
We also provide individual VS project integration through a NuGet package. This will modify the project file, so we do not recommend this approach for open source projects.
|
||||
|
||||
@ -12,10 +12,10 @@ To change the triplet used by your project, such as to enable static linking, se
|
||||
### VCPKG_TARGET_ARCHITECTURE
|
||||
Specifies the target machine architecture.
|
||||
|
||||
Valid options are `x86`, `x64`, and `arm`.
|
||||
Valid options are `x86`, `x64`, `arm`, and `arm64`.
|
||||
|
||||
### VCPKG_CRT_LINKAGE
|
||||
Specifies the desired MSVCRT linkage.
|
||||
Specifies the desired CRT linkage (for MSVC).
|
||||
|
||||
Valid options are `dynamic` and `static`.
|
||||
|
||||
@ -27,30 +27,78 @@ Valid options are `dynamic` and `static`. Note that libraries can ignore this se
|
||||
### VCPKG_CMAKE_SYSTEM_NAME
|
||||
Specifies the target platform.
|
||||
|
||||
Valid options are `WindowsStore` or empty. Empty corresponds to Windows Desktop and `WindowsStore` corresponds to UWP.
|
||||
When setting this variable to `WindowsStore`, you must also set `VCPKG_CMAKE_SYSTEM_VERSION` to `10.0`.
|
||||
Valid options include any CMake system name, such as:
|
||||
- Empty (Windows Desktop for legacy reasons)
|
||||
- `WindowsStore` (Universal Windows Platform)
|
||||
- `Darwin` (Mac OSX)
|
||||
- `Linux` (Linux)
|
||||
|
||||
### VCPKG_PLATFORM_TOOLSET
|
||||
Specifies the C/C++ compiler toolchain to use.
|
||||
Specifies the VS-based C/C++ compiler toolchain to use.
|
||||
|
||||
This can be set to `v141`, `v140`, or left blank. If left blank, we select the latest compiler toolset available on your machine.
|
||||
|
||||
Visual Studio 2015 platform toolset is `v140`
|
||||
Visual Studio 2017 platform toolset is `v141`
|
||||
|
||||
### VCPKG_VISUAL_STUDIO_PATH
|
||||
Specifies the Visual Studio installation to use.
|
||||
|
||||
When unspecified, a Visual Studio instance is selected automatically, preferring Stable 2017, then Preview 2017, then 2015.
|
||||
|
||||
The path should be absolute, formatted with backslashes, and have no trailing slash:
|
||||
```cmake
|
||||
set(VCPKG_VISUAL_STUDIO_PATH "C:\\Program Files (x86)\\Microsoft Visual Studio\\Preview\\Community")
|
||||
```
|
||||
|
||||
### VCPKG_CHAINLOAD_TOOLCHAIN_FILE
|
||||
Specifies an alternate CMake Toolchain file to use.
|
||||
|
||||
This (if set) will override all other compiler detection logic. By default, a toolchain file is selected from `scripts/toolchains/` appropriate to the platform.
|
||||
|
||||
See also the CMake documentation for toolchain files: https://cmake.org/cmake/help/v3.11/manual/cmake-toolchains.7.html.
|
||||
|
||||
### VCPKG_CXX_FLAGS
|
||||
Sets additional compiler flags to be used when not using `VCPKG_CHAINLOAD_TOOLCHAIN_FILE`.
|
||||
|
||||
This option also has forms for configuration-specific and C flags:
|
||||
- `VCPKG_CXX_FLAGS`
|
||||
- `VCPKG_CXX_FLAGS_DEBUG`
|
||||
- `VCPKG_CXX_FLAGS_RELEASE`
|
||||
- `VCPKG_C_FLAGS`
|
||||
- `VCPKG_C_FLAGS_DEBUG`
|
||||
- `VCPKG_C_FLAGS_RELEASE`
|
||||
|
||||
## macOS Variables
|
||||
|
||||
### VCPKG_INSTALL_NAME_DIR
|
||||
Sets the install name used when building macOS dynamic libraries. Default value is `@rpath`. See the CMake documentation for [CMAKE_INSTALL_NAME_DIR](https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_NAME_DIR.html) for more information.
|
||||
|
||||
### VCPKG_OSX_DEPLOYMENT_TARGET
|
||||
Sets the minimum macOS version for compiled binaries. This also changes what versions of the macOS platform SDK that CMake will search for. See the CMake documentation for [CMAKE_OSX_DEPLOYMENT_TARGET](https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_DEPLOYMENT_TARGET.html) for more information.
|
||||
|
||||
### VCPKG_OSX_SYSROOT
|
||||
Set the name or path of the macOS platform SDK that will be used by CMake. See the CMake documentation for [CMAKE_OSX_SYSROOT](https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_SYSROOT.html) for more information.
|
||||
|
||||
## Per-port customization
|
||||
The CMake Macro `PORT` will be set when interpreting the triplet file and can be used to change settings (such as `VCPKG_LIBRARY_LINKAGE`) on a per-port basis.
|
||||
|
||||
Example:
|
||||
```cmake
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
if(PORT MATCHES "qt5-")
|
||||
set(VCPKG_LIBRARY_LINKAGE dynamic)
|
||||
endif()
|
||||
```
|
||||
This will build all the `qt5-*` libraries as DLLs against the dynamic CRT, but every other library as a static library (still against the dynamic CRT).
|
||||
This will build all the `qt5-*` libraries as DLLs, but every other library as a static library.
|
||||
|
||||
For an example in a real project, see https://github.com/Intelight/vcpkg/blob/master/triplets/x86-windows-mixed.cmake.
|
||||
|
||||
## Additional Remarks
|
||||
The default triplet when running any vcpkg command is `%VCPKG_DEFAULT_TRIPLET%` or `x86-windows` if that environment variable is undefined.
|
||||
The default triplet when running any vcpkg command is `%VCPKG_DEFAULT_TRIPLET%` or a platform-specific choice if that environment variable is undefined.
|
||||
|
||||
- Windows: `x86-windows`
|
||||
- Linux: `x64-linux`
|
||||
- OSX: `x64-osx`
|
||||
|
||||
We recommend using a systematic naming scheme when creating new triplets. The Android toolchain naming scheme is a good source of inspiration: https://developer.android.com/ndk/guides/standalone_toolchain.html.
|
||||
|
||||
4
ports/3fd/CONTROL
Normal file
4
ports/3fd/CONTROL
Normal file
@ -0,0 +1,4 @@
|
||||
Source: 3fd
|
||||
Version: 2.6.2
|
||||
Description: C++ Framework For Fast Development
|
||||
Build-Depends: boost-lockfree (windows), boost-regex (windows), poco (windows), sqlite3, rapidxml
|
||||
111
ports/3fd/portfile.cmake
Normal file
111
ports/3fd/portfile.cmake
Normal file
@ -0,0 +1,111 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
# Check architecture:
|
||||
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
||||
set(BUILD_ARCH "Win32")
|
||||
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
||||
set(BUILD_ARCH "x64")
|
||||
elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
|
||||
set(BUILD_ARCH "ARM")
|
||||
else()
|
||||
message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
|
||||
endif()
|
||||
|
||||
# Check library linkage:
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
message("3FD only supports static library linkage. Building static.")
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
endif()
|
||||
|
||||
# Check CRT linkage:
|
||||
if (VCPKG_CRT_LINKAGE STREQUAL "static")
|
||||
message(FATAL_ERROR "3FD can only be built with dynamic linkage to CRT!")
|
||||
endif()
|
||||
|
||||
# Get source code:
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO faburaya/3FD
|
||||
REF v2.6.2
|
||||
SHA512 a2444cc07d8741540c6071ac59bc8c63785db52e412a843aa18a5dfa0144b5001d428e44bcb520238e3d476440bc74526343f025005f05d534e732645f59cbe0
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
"${CMAKE_CURRENT_LIST_DIR}/remove-seekpos.patch"
|
||||
)
|
||||
|
||||
# Copy the sources to ensure a clean, out-of-source build
|
||||
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
|
||||
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
|
||||
file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all)
|
||||
get_filename_component(LAST_DIR_NAME "${SOURCE_PATH}" NAME)
|
||||
set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-all/${LAST_DIR_NAME}")
|
||||
|
||||
# Build:
|
||||
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # UWP:
|
||||
vcpkg_build_msbuild(
|
||||
USE_VCPKG_INTEGRATION
|
||||
PROJECT_PATH ${SOURCE_PATH}/3FD/3FD.WinRT.UWP.vcxproj
|
||||
PLATFORM ${BUILD_ARCH}
|
||||
)
|
||||
elseif (NOT VCPKG_CMAKE_SYSTEM_NAME) # Win32:
|
||||
vcpkg_build_msbuild(
|
||||
USE_VCPKG_INTEGRATION
|
||||
PROJECT_PATH ${SOURCE_PATH}/3FD/3FD.vcxproj
|
||||
PLATFORM ${BUILD_ARCH}
|
||||
TARGET Build
|
||||
)
|
||||
else()
|
||||
message(FATAL_ERROR "Unsupported system: 3FD is not currently ported to VCPKG in ${VCPKG_CMAKE_SYSTEM_NAME}!")
|
||||
endif()
|
||||
|
||||
# Install:
|
||||
file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/3FD/*.h")
|
||||
file(INSTALL
|
||||
${HEADER_FILES}
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD
|
||||
PATTERN "*_impl*.h" EXCLUDE
|
||||
PATTERN "*example*.h" EXCLUDE
|
||||
PATTERN "stdafx.h" EXCLUDE
|
||||
PATTERN "targetver.h" EXCLUDE
|
||||
)
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/btree DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD)
|
||||
file(INSTALL ${SOURCE_PATH}/OpenCL/CL DESTINATION ${CURRENT_PACKAGES_DIR}/include/3FD)
|
||||
|
||||
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/3FD)
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/3FD/3fd-config-template.xml
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/share/3FD
|
||||
)
|
||||
|
||||
if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # Visual C++, UWP app:
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.WinRT.UWP/3FD.WinRT.UWP.lib
|
||||
${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.WinRT.UWP/_3FD_WinRT_UWP.pri
|
||||
${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/WinRT.UWP/3FD.WinRT.UWP.pdb
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
|
||||
)
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.WinRT.UWP/3FD.WinRT.UWP.lib
|
||||
${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.WinRT.UWP/_3FD_WinRT_UWP.pri
|
||||
${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/WinRT.UWP/3FD.WinRT.UWP.pdb
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
|
||||
)
|
||||
else() # Visual C++, Win32 app:
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.lib
|
||||
${SOURCE_PATH}/3FD/${BUILD_ARCH}/Debug/3FD.pdb
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
|
||||
)
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.lib
|
||||
${SOURCE_PATH}/3FD/${BUILD_ARCH}/Release/3FD.pdb
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/lib
|
||||
)
|
||||
endif()
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd RENAME copyright)
|
||||
file(INSTALL ${SOURCE_PATH}/Acknowledgements.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/3fd)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
13
ports/3fd/remove-seekpos.patch
Normal file
13
ports/3fd/remove-seekpos.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/3fd/web_wws_impl_host.cpp b/3fd/web_wws_impl_host.cpp
|
||||
index b87dc75..1cff45f 100644
|
||||
--- a/3fd/web_wws_impl_host.cpp
|
||||
+++ b/3fd/web_wws_impl_host.cpp
|
||||
@@ -48,7 +48,7 @@ namespace wws
|
||||
throw AppException<std::runtime_error>(oss.str());
|
||||
}
|
||||
|
||||
- const auto fileSizeBytes = inputStream.seekg(0, std::ios::end).tellg().seekpos(); // move cursor to the end to get the zize
|
||||
+ const auto fileSizeBytes = inputStream.seekg(0, std::ios::end).tellg(); // move cursor to the end to get the zize
|
||||
|
||||
// File is not trunked:
|
||||
if (fileSizeBytes > 0)
|
||||
@ -16,9 +16,8 @@ endif()
|
||||
|
||||
function(add_sublibrary LIB)
|
||||
file(GLOB_RECURSE SOURCES "absl/${LIB}/*.cc")
|
||||
list(FILTER SOURCES EXCLUDE REGEX "_test(ing)?(_.+)?.cc$|_nonprod.cc$")
|
||||
file(GLOB HEADERS "absl/${LIB}/*.h" "absl/${LIB}/*.inc")
|
||||
file(GLOB INTERNAL_HEADERS "absl/${LIB}/internal/*.h")
|
||||
list(FILTER SOURCES EXCLUDE REGEX "_test(ing)?(_.+)?.cc$|_nonprod.cc$|test_util.cc$|_benchmark.cc$")
|
||||
file(GLOB_RECURSE HEADERS "absl/${LIB}/*.h" "absl/${LIB}/*.inc")
|
||||
|
||||
if(SOURCES)
|
||||
if("STATIC" IN_LIST ARGN)
|
||||
@ -33,7 +32,6 @@ function(add_sublibrary LIB)
|
||||
target_include_directories(${LIB} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
|
||||
endif()
|
||||
|
||||
|
||||
install(TARGETS ${LIB} EXPORT unofficial-abseil-targets
|
||||
RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION lib
|
||||
@ -42,10 +40,11 @@ function(add_sublibrary LIB)
|
||||
|
||||
if(INSTALL_HEADERS)
|
||||
if(HEADERS)
|
||||
install(FILES ${HEADERS} DESTINATION "include/absl/${LIB}")
|
||||
endif()
|
||||
if(INTERNAL_HEADERS)
|
||||
install(FILES ${INTERNAL_HEADERS} DESTINATION "include/absl/${LIB}/internal")
|
||||
foreach(file IN LISTS HEADERS)
|
||||
get_filename_component(dir ${file} DIRECTORY)
|
||||
file(RELATIVE_PATH rel_dir ${CMAKE_SOURCE_DIR}/absl/${LIB} ${dir})
|
||||
install(FILES ${file} DESTINATION "include/absl/${LIB}/${rel_dir}")
|
||||
endforeach()
|
||||
endif()
|
||||
endif()
|
||||
endfunction()
|
||||
@ -63,6 +62,7 @@ add_sublibrary(algorithm)
|
||||
add_sublibrary(base)
|
||||
add_sublibrary(container)
|
||||
add_sublibrary(debugging)
|
||||
add_sublibrary(hash)
|
||||
add_sublibrary(memory)
|
||||
add_sublibrary(meta)
|
||||
add_sublibrary(numeric)
|
||||
@ -75,6 +75,8 @@ add_sublibrary(utility)
|
||||
|
||||
target_link_public_libraries(algorithm base meta)
|
||||
target_link_public_libraries(container algorithm base memory)
|
||||
target_link_public_libraries(debugging base)
|
||||
target_link_public_libraries(hash base)
|
||||
target_link_public_libraries(memory meta)
|
||||
target_link_public_libraries(meta base)
|
||||
target_link_public_libraries(numeric base)
|
||||
@ -84,9 +86,6 @@ target_link_public_libraries(utility base meta)
|
||||
target_link_public_libraries(time base numeric)
|
||||
target_link_public_libraries(synchronization base time)
|
||||
|
||||
find_package(unofficial-cctz REQUIRED)
|
||||
target_link_libraries(time PUBLIC unofficial::cctz)
|
||||
|
||||
install(
|
||||
EXPORT unofficial-abseil-targets
|
||||
FILE unofficial-abseil-config.cmake
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
Source: abseil
|
||||
Version: 2018-04-12
|
||||
Version: 2018-11-08-1
|
||||
Description: an open-source collection designed to augment the C++ standard library.
|
||||
Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
|
||||
In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
|
||||
Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole.
|
||||
Build-Depends: cctz
|
||||
|
||||
@ -7,8 +7,8 @@ endif()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO abseil/abseil-cpp
|
||||
REF a7e522daf1ec9cda69b356472f662142dd0c1215
|
||||
SHA512 250b602fc3f5a4c3b6522ef0f49bdf63db0070289cb415cb31bb672b95b35dc9494f881adeb1b090927b1cd942c3674b6142747f601c8f7233bd12d4078583f3
|
||||
REF 070f6e47b33a2909d039e620c873204f78809492
|
||||
SHA512 84bc7b17519d3cae471f0e2602ed32111e99d20abfdff26f1e36fd712ff9013b9768b3d37b9179dc40cb1b4a350da1b6955a881c5300ea9b608f97a3101c2762
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
Source: ace
|
||||
Version: 6.4.7
|
||||
Version: 6.5.3
|
||||
Description: The ADAPTIVE Communication Environment
|
||||
|
||||
@ -9,9 +9,9 @@ endif()
|
||||
include(vcpkg_common_functions)
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "http://download.dre.vanderbilt.edu/previous_versions/ACE-6.4.7.zip"
|
||||
FILENAME "ACE-6.4.7.zip"
|
||||
SHA512 931c7e5902f3999ed05c13f9d2c53a605e9b59b4ce78f33b42238ac25286aa13fb510e2f780b6aea9505d03edf834109ab4481870327fec1b5bb11d29cfbafdc
|
||||
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_3/ACE-6.5.3.zip"
|
||||
FILENAME ACE-6.5.3.zip
|
||||
SHA512 1c24c7a138b6580e0f2a71d3e797ed846a3c046854c19d10175198dc519b610b2ac684d6e0e3999705319304b6eee3f09405cb43ce48a869d2f1446342da469d
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
|
||||
3
ports/aixlog/CONTROL
Normal file
3
ports/aixlog/CONTROL
Normal file
@ -0,0 +1,3 @@
|
||||
Source: aixlog
|
||||
Version: 1.2.1
|
||||
Description: Header-only C++ logging library
|
||||
@ -1,25 +1,32 @@
|
||||
# Common Ambient Variables:
|
||||
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
|
||||
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
|
||||
# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
|
||||
# PORT = current port name (zlib, etc)
|
||||
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
|
||||
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
|
||||
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
|
||||
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
|
||||
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
|
||||
#
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO ThePhD/sol2
|
||||
REF v2.19.5
|
||||
SHA512 c004c2331e2eb0aae4467c10609f73879246c3ab5b7421e5b6fcb91b0c6595d999e5fd4c70b1859af1febb374631640d6727bf236a0cd176e40f631813e243a9
|
||||
HEAD_REF develop
|
||||
)
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/single/sol/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/)
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sol RENAME copyright)
|
||||
# Common Ambient Variables:
|
||||
# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
|
||||
# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
|
||||
# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT}
|
||||
# PORT = current port name (zlib, etc)
|
||||
# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc)
|
||||
# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic)
|
||||
# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic)
|
||||
# VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
|
||||
# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
|
||||
#
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO badaix/aixlog
|
||||
REF v1.2.1
|
||||
SHA512 776558fdd911f0cc9e8d467bf8e00a1930d2e51bb8ccd5f36f95955fefecab65faf575a80fdaacfe83fd32808f8b9c2e0323b16823e0431300df7bc0c1dfde12
|
||||
)
|
||||
|
||||
|
||||
|
||||
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include)
|
||||
file(COPY ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include)
|
||||
|
||||
|
||||
# Handle copyright
|
||||
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aixlog)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/aixlog/LICENSE ${CURRENT_PACKAGES_DIR}/share/aixlog/copyright)
|
||||
|
||||
# Post-build test for cmake libraries
|
||||
# vcpkg_test_cmake(PACKAGE_NAME aixlog)
|
||||
@ -1,4 +1,4 @@
|
||||
Source: alembic
|
||||
Version: 1.7.7
|
||||
Version: 1.7.9
|
||||
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. http://alembic.io/
|
||||
|
||||
@ -8,8 +8,8 @@ endif()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO alembic/alembic
|
||||
REF 1.7.7
|
||||
SHA512 0ebcf6b9304e84bc60f1c146d0b5e5c5b1de43974ec0725293c444b48b22640945f5883eb9afd46c1ac9f0c260d6f22ff29b4866d6525c416339877be984b149
|
||||
REF 1.7.9
|
||||
SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Source: allegro5
|
||||
Version: 5.2.3.0
|
||||
Version: 5.2.4.0
|
||||
Description: Allegro is a cross-platform library mainly aimed at video game and multimedia programming. It handles common, low-level tasks such as creating windows, accepting user input, loading data, drawing images, playing sounds, etc. and generally abstracting away the underlying platform. However, Allegro is not a game engine: you are free to design and structure your program as you like.
|
||||
Build-Depends: opengl, zlib, freetype, libogg, libvorbis, libflac, openal-soft, libpng, bzip2, physfs, libtheora, opus, opusfile
|
||||
|
||||
@ -14,8 +14,8 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO liballeg/allegro5
|
||||
REF 5.2.3.0
|
||||
SHA512 419f036d0265062dbec0e9306b153de5af5375186f7b5b2fe62a80549fc0e2c2a6afff81a6772effa7624fe2e452ed0a2830872ef25cc3b23fea93af99f60ba9
|
||||
REF 5.2.4.0
|
||||
SHA512 46a7c7b65ffb49ae5c81e5a33d850b4ae94b59135fc9b15174ffe86133445ff328c623c2c48298d3f631cc6310d51f4f3f07b8b952ecbd360755001292cbda8b
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
||||
@ -1,210 +1,302 @@
|
||||
cmake_minimum_required(VERSION 3.8)
|
||||
project(angle CXX)
|
||||
|
||||
if(WIN32 AND NOT WINDOWS_STORE)
|
||||
set(WINDOWS_DESKTOP 1)
|
||||
else()
|
||||
set(WINDOWS_DESKTOP 0)
|
||||
endif()
|
||||
|
||||
add_compile_options(/d2guard4 /Wv:18)
|
||||
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /guard:cf")
|
||||
|
||||
add_definitions(
|
||||
-D_CRT_SECURE_NO_DEPRECATE
|
||||
-D_SCL_SECURE_NO_WARNINGS
|
||||
-D_HAS_EXCEPTIONS=0
|
||||
-DNOMINMAX
|
||||
-DANGLE_STANDALONE_BUILD
|
||||
-DANGLE_ENABLE_DEBUG_ANNOTATIONS
|
||||
)
|
||||
|
||||
configure_file(commit.h include/id/commit.h COPYONLY)
|
||||
include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include)
|
||||
|
||||
##########
|
||||
# angle::common
|
||||
file(GLOB ANGLE_COMMON_SOURCES "src/common/*.h" "src/common/*.inl" "src/common/*.cpp" "src/common/third_party/base/*.h")
|
||||
list(FILTER ANGLE_COMMON_SOURCES EXCLUDE REGEX "_unittest|event_tracer|_linux|_mac")
|
||||
add_library(angle_common STATIC ${ANGLE_COMMON_SOURCES})
|
||||
target_include_directories(angle_common PUBLIC src/common/third_party/base)
|
||||
add_library(angle::common ALIAS angle_common)
|
||||
|
||||
##########
|
||||
# angle::image_util
|
||||
file(GLOB ANGLE_IMAGE_UTIL_SOURCES "src/image_util/*.h" "src/image_util/*.inl" "src/image_util/*.cpp")
|
||||
add_library(angle_image_util STATIC ${ANGLE_IMAGE_UTIL_SOURCES})
|
||||
target_link_libraries(angle_image_util PRIVATE angle::common)
|
||||
add_library(angle::image_util ALIAS angle_image_util)
|
||||
|
||||
##########
|
||||
# angle::translator
|
||||
file(GLOB TRANSLATOR_SOURCES
|
||||
"src/compiler/translator/glslang.l"
|
||||
"src/compiler/translator/glslang.y"
|
||||
"src/compiler/translator/*.h"
|
||||
"src/compiler/translator/*.cpp"
|
||||
"src/third_party/compiler/ArrayBoundsClamper.cpp"
|
||||
)
|
||||
add_library(angle_translator STATIC ${TRANSLATOR_SOURCES})
|
||||
target_compile_definitions(angle_translator PUBLIC
|
||||
-DANGLE_ENABLE_ESSL
|
||||
-DANGLE_ENABLE_GLSL
|
||||
-DANGLE_ENABLE_HLSL
|
||||
)
|
||||
target_link_libraries(angle_translator PRIVATE angle::common)
|
||||
add_library(angle::translator ALIAS angle_translator)
|
||||
|
||||
##########
|
||||
# angle::preprocessor
|
||||
file(GLOB PREPROCESSOR_SOURCES
|
||||
"src/compiler/preprocessor/*.h"
|
||||
"src/compiler/preprocessor/*.cpp"
|
||||
)
|
||||
add_library(angle_preprocessor STATIC ${PREPROCESSOR_SOURCES})
|
||||
target_link_libraries(angle_preprocessor PRIVATE angle::common)
|
||||
add_library(angle::preprocessor ALIAS angle_preprocessor)
|
||||
|
||||
##########
|
||||
# libANGLE
|
||||
|
||||
## OpenGL Renderer
|
||||
if(WINDOWS_DESKTOP)
|
||||
file(GLOB LIBANGLE_GL_SOURCES
|
||||
"src/libANGLE/renderer/gl/*.cpp"
|
||||
"src/libANGLE/renderer/gl/*.inl"
|
||||
"src/libANGLE/renderer/gl/*.h"
|
||||
|
||||
"src/libANGLE/renderer/gl/wgl/*.cpp"
|
||||
"src/libANGLE/renderer/gl/wgl/*.inl"
|
||||
"src/libANGLE/renderer/gl/wgl/*.h"
|
||||
)
|
||||
list(FILTER LIBANGLE_GL_SOURCES EXCLUDE REGEX "_unittest")
|
||||
add_library(angle_renderer_opengl INTERFACE)
|
||||
target_sources(angle_renderer_opengl INTERFACE ${LIBANGLE_GL_SOURCES})
|
||||
target_compile_definitions(angle_renderer_opengl INTERFACE -DANGLE_ENABLE_OPENGL)
|
||||
add_library(angle::renderer::opengl ALIAS angle_renderer_opengl)
|
||||
endif()
|
||||
|
||||
## All D3D Sources
|
||||
file(GLOB_RECURSE LIBANGLE_D3D_SOURCES
|
||||
"src/libANGLE/renderer/d3d/*.cpp"
|
||||
"src/libANGLE/renderer/d3d/*.inl"
|
||||
"src/libANGLE/renderer/d3d/*.h"
|
||||
)
|
||||
list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "_unittest")
|
||||
|
||||
## WinRT D3D Renderer
|
||||
if(WINDOWS_STORE)
|
||||
set(LIBANGLE_D3D_WINRT_SOURCES ${LIBANGLE_D3D_SOURCES})
|
||||
list(FILTER LIBANGLE_D3D_WINRT_SOURCES INCLUDE REGEX "winrt")
|
||||
add_library(angle_renderer_winrt INTERFACE)
|
||||
target_sources(angle_renderer_winrt INTERFACE ${LIBANGLE_D3D_WINRT_SOURCES})
|
||||
add_library(angle::renderer::winrt ALIAS angle_renderer_winrt)
|
||||
endif()
|
||||
|
||||
## Win32/d3d9 D3D Renderer
|
||||
if(WINDOWS_DESKTOP)
|
||||
set(LIBANGLE_D3D_DESKTOP_SOURCES ${LIBANGLE_D3D_SOURCES})
|
||||
list(FILTER LIBANGLE_D3D_DESKTOP_SOURCES INCLUDE REGEX "d3d9|win32")
|
||||
find_library(D3D9_LIB NAMES d3d9)
|
||||
add_library(angle_renderer_win32 INTERFACE)
|
||||
target_sources(angle_renderer_win32 INTERFACE ${LIBANGLE_D3D_DESKTOP_SOURCES})
|
||||
target_compile_definitions(angle_renderer_win32 INTERFACE -DANGLE_ENABLE_D3D9)
|
||||
target_link_libraries(angle_renderer_win32 INTERFACE ${D3D9_LIB})
|
||||
add_library(angle::renderer::win32 ALIAS angle_renderer_win32)
|
||||
endif()
|
||||
|
||||
## D3D11 Base renderer
|
||||
list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "winrt|d3d9|win32")
|
||||
find_library(DXGUID_LIB NAMES dxguid)
|
||||
find_library(D3D11_LIB NAMES d3d11)
|
||||
add_library(angle_renderer_d3d INTERFACE)
|
||||
target_sources(angle_renderer_d3d INTERFACE ${LIBANGLE_D3D_SOURCES})
|
||||
target_compile_definitions(angle_renderer_d3d INTERFACE
|
||||
-DANGLE_ENABLE_D3D11
|
||||
"-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }"
|
||||
)
|
||||
target_link_libraries(angle_renderer_d3d INTERFACE ${D3D11_LIB} ${DXGUID_LIB})
|
||||
add_library(angle::renderer::d3d ALIAS angle_renderer_d3d)
|
||||
|
||||
## Core libANGLE library
|
||||
file(GLOB LIBANGLE_SOURCES
|
||||
"src/third_party/systeminfo/SystemInfo.cpp"
|
||||
"src/common/third_party/murmurhash/MurmurHash3.cpp"
|
||||
"src/common/event_tracer.cpp"
|
||||
|
||||
"src/libANGLE/*.cpp"
|
||||
"src/libANGLE/*.inl"
|
||||
"src/libANGLE/*.h"
|
||||
|
||||
"src/libANGLE/renderer/*.cpp"
|
||||
"src/libANGLE/renderer/*.inl"
|
||||
"src/libANGLE/renderer/*.h"
|
||||
|
||||
"src/libANGLE/renderer/null/*.cpp"
|
||||
"src/libANGLE/renderer/null/*.inl"
|
||||
"src/libANGLE/renderer/null/*.h"
|
||||
)
|
||||
list(FILTER LIBANGLE_SOURCES EXCLUDE REGEX "_unittest")
|
||||
|
||||
add_library(libANGLE STATIC ${LIBANGLE_SOURCES})
|
||||
target_link_libraries(libANGLE PRIVATE
|
||||
angle::common
|
||||
angle::image_util
|
||||
angle::translator
|
||||
angle::preprocessor
|
||||
angle::renderer::d3d
|
||||
$<$<BOOL:${WINDOWS_STORE}>:angle::renderer::winrt>
|
||||
$<$<BOOL:${WINDOWS_DESKTOP}>:angle::renderer::win32>
|
||||
$<$<BOOL:${WINDOWS_DESKTOP}>:angle::renderer::opengl>
|
||||
)
|
||||
target_include_directories(libANGLE PRIVATE "src/third_party/khronos")
|
||||
target_compile_definitions(libANGLE
|
||||
PRIVATE -DANGLE_ENABLE_NULL
|
||||
PUBLIC -DLIBANGLE_IMPLEMENTATION
|
||||
)
|
||||
add_library(angle::libANGLE ALIAS libANGLE)
|
||||
|
||||
##########
|
||||
# libGLESv2
|
||||
file(GLOB LIBGLESV2_SOURCES "src/libGLESv2/*.h" "src/libGLESv2/*.cpp" "src/libGLESv2/libGLESv2.def")
|
||||
add_library(libGLESv2 ${LIBGLESV2_SOURCES})
|
||||
target_link_libraries(libGLESv2 PRIVATE angle::common angle::libANGLE)
|
||||
target_compile_definitions(libGLESv2
|
||||
PRIVATE -DLIBGLESV2_IMPLEMENTATION
|
||||
PUBLIC
|
||||
-DGL_GLEXT_PROTOTYPES
|
||||
-DGL_APICALL=
|
||||
-DEGLAPI=
|
||||
)
|
||||
target_include_directories(libGLESv2 PUBLIC "$<INSTALL_INTERFACE:include>")
|
||||
|
||||
##########
|
||||
# libEGL
|
||||
add_library(libEGL
|
||||
"src/libEGL/libEGL.def"
|
||||
"src/libEGL/libEGL.cpp"
|
||||
"src/libEGL/libEGL.rc"
|
||||
"src/libEGL/resource.h"
|
||||
)
|
||||
target_link_libraries(libEGL PRIVATE angle::common angle::libANGLE libGLESv2)
|
||||
target_include_directories(libEGL PUBLIC "$<INSTALL_INTERFACE:include>")
|
||||
|
||||
install(TARGETS libEGL libGLESv2 EXPORT ANGLEExport
|
||||
RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib
|
||||
)
|
||||
|
||||
install(EXPORT ANGLEExport FILE unofficial-angle-config.cmake NAMESPACE unofficial::angle:: DESTINATION share/unofficial-angle)
|
||||
|
||||
if(NOT DISABLE_INSTALL_HEADERS)
|
||||
install(
|
||||
DIRECTORY include/
|
||||
DESTINATION include
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
PATTERN "GLSLANG" EXCLUDE
|
||||
PATTERN "export.h" EXCLUDE
|
||||
)
|
||||
endif()
|
||||
cmake_minimum_required(VERSION 3.8)
|
||||
project(angle CXX)
|
||||
|
||||
if(WIN32 AND NOT WINDOWS_STORE)
|
||||
set(WINDOWS_DESKTOP 1)
|
||||
else()
|
||||
set(WINDOWS_DESKTOP 0)
|
||||
endif()
|
||||
if (WINDOWS_DESKTOP OR WINDOWS_STORE)
|
||||
set(WINDOWS_ANY 1)
|
||||
else()
|
||||
set(WINDOWS_ANY 0)
|
||||
endif()
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
set(LINUX 1)
|
||||
else()
|
||||
set(LINUX 0)
|
||||
endif()
|
||||
|
||||
if(WINDOWS_ANY)
|
||||
add_compile_options(/d2guard4 /Wv:18 /guard:cf)
|
||||
else()
|
||||
add_compile_options(-std=c++17 -fPIC)
|
||||
endif()
|
||||
|
||||
if (APPLE)
|
||||
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa -framework OpenGL -framework IOKit -framework CoreFoundation -framework IOSurface -framework QuartzCore -framework CoreGraphics")
|
||||
endif()
|
||||
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}")
|
||||
set(CMAKE_STATIC_LIBRARY_PREFIX "")
|
||||
|
||||
add_definitions(
|
||||
-D_CRT_SECURE_NO_DEPRECATE
|
||||
-D_SCL_SECURE_NO_WARNINGS
|
||||
-D_HAS_EXCEPTIONS=0
|
||||
-DNOMINMAX
|
||||
-DANGLE_STANDALONE_BUILD
|
||||
-DANGLE_ENABLE_DEBUG_ANNOTATIONS
|
||||
)
|
||||
|
||||
configure_file(commit.h include/id/commit.h COPYONLY)
|
||||
include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include)
|
||||
|
||||
##########
|
||||
# angle::common
|
||||
if(WINDOWS_ANY)
|
||||
set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac")
|
||||
elseif(LINUX)
|
||||
set(ANGLE_COMMON_PLATFORM_FILTER "_win|_mac")
|
||||
elseif(APPLE)
|
||||
set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win")
|
||||
endif()
|
||||
file(GLOB ANGLE_COMMON_SOURCES "src/common/*.h" "src/common/*.inl" "src/common/*.cpp" "src/common/third_party/base/*.h")
|
||||
list(FILTER ANGLE_COMMON_SOURCES EXCLUDE REGEX "_unittest|event_tracer|${ANGLE_COMMON_PLATFORM_FILTER}")
|
||||
add_library(angle_common STATIC ${ANGLE_COMMON_SOURCES})
|
||||
target_include_directories(angle_common PUBLIC src/common/third_party/base)
|
||||
add_library(angle::common ALIAS angle_common)
|
||||
|
||||
##########
|
||||
# angle::image_util
|
||||
file(GLOB ANGLE_IMAGE_UTIL_SOURCES "src/image_util/*.h" "src/image_util/*.inl" "src/image_util/*.cpp")
|
||||
add_library(angle_image_util STATIC ${ANGLE_IMAGE_UTIL_SOURCES})
|
||||
target_link_libraries(angle_image_util PRIVATE angle::common)
|
||||
add_library(angle::image_util ALIAS angle_image_util)
|
||||
|
||||
##########
|
||||
# angle::translator
|
||||
file(GLOB TRANSLATOR_SOURCES
|
||||
"src/compiler/translator/glslang.l"
|
||||
"src/compiler/translator/glslang.y"
|
||||
"src/compiler/translator/*.h"
|
||||
"src/compiler/translator/*.cpp"
|
||||
"src/third_party/compiler/ArrayBoundsClamper.cpp"
|
||||
)
|
||||
add_library(angle_translator STATIC ${TRANSLATOR_SOURCES})
|
||||
target_compile_definitions(angle_translator PUBLIC
|
||||
-DANGLE_ENABLE_ESSL
|
||||
-DANGLE_ENABLE_GLSL
|
||||
-DANGLE_ENABLE_HLSL
|
||||
)
|
||||
target_link_libraries(angle_translator PRIVATE angle::common)
|
||||
add_library(angle::translator ALIAS angle_translator)
|
||||
|
||||
##########
|
||||
# angle::preprocessor
|
||||
file(GLOB PREPROCESSOR_SOURCES
|
||||
"src/compiler/preprocessor/*.h"
|
||||
"src/compiler/preprocessor/*.cpp"
|
||||
)
|
||||
add_library(angle_preprocessor STATIC ${PREPROCESSOR_SOURCES})
|
||||
target_link_libraries(angle_preprocessor PRIVATE angle::common)
|
||||
add_library(angle::preprocessor ALIAS angle_preprocessor)
|
||||
|
||||
##########
|
||||
# libANGLE
|
||||
|
||||
## OpenGL Renderer
|
||||
if(WINDOWS_DESKTOP OR LINUX OR APPLE)
|
||||
if(WINDOWS_DESKTOP)
|
||||
set(ANGLE_RENDERER_OPENGL_PLATFORM
|
||||
"src/libANGLE/renderer/gl/wgl/*.cpp"
|
||||
"src/libANGLE/renderer/gl/wgl/*.inl"
|
||||
"src/libANGLE/renderer/gl/wgl/*.h"
|
||||
)
|
||||
elseif(APPLE)
|
||||
set(ANGLE_RENDERER_OPENGL_PLATFORM
|
||||
"src/libANGLE/renderer/gl/cgl/*.mm"
|
||||
"src/libANGLE/renderer/gl/cgl/*.cpp"
|
||||
"src/libANGLE/renderer/gl/cgl/*.inl"
|
||||
"src/libANGLE/renderer/gl/cgl/*.h"
|
||||
"gpu_info_util/SystemInfo_mac.mm"
|
||||
)
|
||||
elseif(LINUX)
|
||||
set(ANGLE_RENDERER_OPENGL_PLATFORM
|
||||
"src/libANGLE/renderer/gl/glx/*.cpp"
|
||||
"src/libANGLE/renderer/gl/glx/*.inl"
|
||||
"src/libANGLE/renderer/gl/glx/*.h"
|
||||
)
|
||||
endif()
|
||||
|
||||
file(GLOB LIBANGLE_GL_SOURCES
|
||||
"src/libANGLE/renderer/gl/*.cpp"
|
||||
"src/libANGLE/renderer/gl/*.inl"
|
||||
"src/libANGLE/renderer/gl/*.h"
|
||||
|
||||
${ANGLE_RENDERER_OPENGL_PLATFORM}
|
||||
)
|
||||
list(FILTER LIBANGLE_GL_SOURCES EXCLUDE REGEX "_unittest")
|
||||
add_library(angle_renderer_opengl INTERFACE)
|
||||
target_sources(angle_renderer_opengl INTERFACE ${LIBANGLE_GL_SOURCES})
|
||||
target_compile_definitions(angle_renderer_opengl INTERFACE -DANGLE_ENABLE_OPENGL)
|
||||
add_library(angle::renderer::opengl ALIAS angle_renderer_opengl)
|
||||
endif()
|
||||
|
||||
# D3D Renderers
|
||||
if(WINDOWS_ANY)
|
||||
## All D3D Sources
|
||||
file(GLOB_RECURSE LIBANGLE_D3D_SOURCES
|
||||
"src/libANGLE/renderer/d3d/*.cpp"
|
||||
"src/libANGLE/renderer/d3d/*.inl"
|
||||
"src/libANGLE/renderer/d3d/*.h"
|
||||
)
|
||||
list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "_unittest")
|
||||
|
||||
## WinRT D3D Renderer
|
||||
if(WINDOWS_STORE)
|
||||
set(LIBANGLE_D3D_WINRT_SOURCES ${LIBANGLE_D3D_SOURCES})
|
||||
list(FILTER LIBANGLE_D3D_WINRT_SOURCES INCLUDE REGEX "winrt")
|
||||
add_library(angle_renderer_winrt INTERFACE)
|
||||
target_sources(angle_renderer_winrt INTERFACE ${LIBANGLE_D3D_WINRT_SOURCES})
|
||||
add_library(angle::renderer::winrt ALIAS angle_renderer_winrt)
|
||||
endif()
|
||||
|
||||
## Win32/d3d9 D3D Renderer
|
||||
if(WINDOWS_DESKTOP)
|
||||
set(LIBANGLE_D3D_DESKTOP_SOURCES ${LIBANGLE_D3D_SOURCES})
|
||||
list(FILTER LIBANGLE_D3D_DESKTOP_SOURCES INCLUDE REGEX "d3d9|win32")
|
||||
find_library(D3D9_LIB NAMES d3d9)
|
||||
add_library(angle_renderer_win32 INTERFACE)
|
||||
target_sources(angle_renderer_win32 INTERFACE ${LIBANGLE_D3D_DESKTOP_SOURCES})
|
||||
target_compile_definitions(angle_renderer_win32 INTERFACE -DANGLE_ENABLE_D3D9)
|
||||
target_link_libraries(angle_renderer_win32 INTERFACE ${D3D9_LIB})
|
||||
add_library(angle::renderer::win32 ALIAS angle_renderer_win32)
|
||||
endif()
|
||||
|
||||
## D3D11 Base renderer
|
||||
list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "winrt|d3d9|win32")
|
||||
find_library(DXGUID_LIB NAMES dxguid)
|
||||
find_library(D3D11_LIB NAMES d3d11)
|
||||
add_library(angle_renderer_d3d INTERFACE)
|
||||
target_sources(angle_renderer_d3d INTERFACE ${LIBANGLE_D3D_SOURCES})
|
||||
target_compile_definitions(angle_renderer_d3d INTERFACE
|
||||
-DANGLE_ENABLE_D3D11
|
||||
"-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }"
|
||||
)
|
||||
target_link_libraries(angle_renderer_d3d INTERFACE ${D3D11_LIB} ${DXGUID_LIB})
|
||||
add_library(angle::renderer::d3d ALIAS angle_renderer_d3d)
|
||||
endif()
|
||||
|
||||
## Core libANGLE library
|
||||
if(WINDOWS_ANY)
|
||||
set(LIBANGLE_SOURCES_PLATFORM
|
||||
"src/third_party/systeminfo/SystemInfo.cpp"
|
||||
)
|
||||
else()
|
||||
set(LIBANGLE_SOURCES_PLATFORM )
|
||||
endif()
|
||||
|
||||
file(GLOB LIBANGLE_SOURCES
|
||||
"src/common/third_party/murmurhash/MurmurHash3.cpp"
|
||||
"src/common/event_tracer.cpp"
|
||||
|
||||
"src/libANGLE/*.cpp"
|
||||
"src/libANGLE/*.inl"
|
||||
"src/libANGLE/*.h"
|
||||
|
||||
"src/libANGLE/renderer/*.cpp"
|
||||
"src/libANGLE/renderer/*.inl"
|
||||
"src/libANGLE/renderer/*.h"
|
||||
|
||||
"src/libANGLE/renderer/null/*.cpp"
|
||||
"src/libANGLE/renderer/null/*.inl"
|
||||
"src/libANGLE/renderer/null/*.h"
|
||||
|
||||
${LIBANGLE_SOURCES_PLATFORM}
|
||||
)
|
||||
list(FILTER LIBANGLE_SOURCES EXCLUDE REGEX "_unittest")
|
||||
|
||||
if(LINUX OR APPLE)
|
||||
set(LIBANGLE_RENDERER_PLATFORM
|
||||
angle::renderer::opengl
|
||||
)
|
||||
elseif(WINDOWS_STORE)
|
||||
set(LIBANGLE_RENDERER_PLATFORM
|
||||
angle::renderer::d3d
|
||||
angle::renderer::winrt
|
||||
)
|
||||
elseif(WINDOWS_DESKTOP)
|
||||
set(LIBANGLE_RENDERER_PLATFORM
|
||||
angle::renderer::d3d
|
||||
angle::renderer::win32
|
||||
angle::renderer::opengl
|
||||
)
|
||||
else()
|
||||
set(LIBANGLE_RENDERER_PLATFORM )
|
||||
endif()
|
||||
|
||||
if(LINUX)
|
||||
set(LIBANGLE_RENDERER_COMPILEDEF
|
||||
-DANGLE_USE_X11
|
||||
)
|
||||
else()
|
||||
set(LIBANGLE_RENDERER_COMPILEDEF )
|
||||
endif()
|
||||
|
||||
add_library(libANGLE STATIC ${LIBANGLE_SOURCES})
|
||||
target_link_libraries(libANGLE PRIVATE
|
||||
angle::common
|
||||
angle::image_util
|
||||
angle::translator
|
||||
angle::preprocessor
|
||||
${LIBANGLE_RENDERER_PLATFORM}
|
||||
)
|
||||
target_include_directories(libANGLE PRIVATE "src/third_party/khronos")
|
||||
target_compile_definitions(libANGLE
|
||||
PRIVATE -DANGLE_ENABLE_NULL
|
||||
PUBLIC
|
||||
-DLIBANGLE_IMPLEMENTATION
|
||||
${LIBANGLE_RENDERER_COMPILEDEF}
|
||||
)
|
||||
add_library(angle::libANGLE ALIAS libANGLE)
|
||||
|
||||
##########
|
||||
# libGLESv2
|
||||
file(GLOB LIBGLESV2_SOURCES "src/libGLESv2/*.h" "src/libGLESv2/*.cpp" "src/libGLESv2/libGLESv2.def")
|
||||
add_library(libGLESv2 ${LIBGLESV2_SOURCES})
|
||||
target_link_libraries(libGLESv2 PRIVATE angle::common angle::libANGLE)
|
||||
target_compile_definitions(libGLESv2
|
||||
PRIVATE -DLIBGLESV2_IMPLEMENTATION
|
||||
PUBLIC
|
||||
-DGL_GLEXT_PROTOTYPES
|
||||
-DGL_APICALL=
|
||||
-DEGLAPI=
|
||||
)
|
||||
target_include_directories(libGLESv2 PUBLIC "$<INSTALL_INTERFACE:include>")
|
||||
|
||||
##########
|
||||
# libEGL
|
||||
add_library(libEGL
|
||||
"src/libEGL/libEGL.def"
|
||||
"src/libEGL/libEGL.cpp"
|
||||
"src/libEGL/libEGL.rc"
|
||||
"src/libEGL/resource.h"
|
||||
)
|
||||
target_link_libraries(libEGL PRIVATE angle::common angle::libANGLE libGLESv2)
|
||||
target_include_directories(libEGL PUBLIC "$<INSTALL_INTERFACE:include>")
|
||||
|
||||
|
||||
SET_TARGET_PROPERTIES(libANGLE PROPERTIES PREFIX "")
|
||||
SET_TARGET_PROPERTIES(libGLESv2 PROPERTIES PREFIX "")
|
||||
SET_TARGET_PROPERTIES(libEGL PROPERTIES PREFIX "")
|
||||
|
||||
install(TARGETS libEGL libGLESv2 EXPORT ANGLEExport
|
||||
RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION lib
|
||||
ARCHIVE DESTINATION lib
|
||||
)
|
||||
|
||||
install(EXPORT ANGLEExport FILE unofficial-angle-config.cmake NAMESPACE unofficial::angle:: DESTINATION share/unofficial-angle)
|
||||
|
||||
if(NOT DISABLE_INSTALL_HEADERS)
|
||||
install(
|
||||
DIRECTORY include/
|
||||
DESTINATION include
|
||||
FILES_MATCHING PATTERN "*.h"
|
||||
PATTERN "GLSLANG" EXCLUDE
|
||||
PATTERN "EGL" EXCLUDE
|
||||
PATTERN "KHR" EXCLUDE
|
||||
PATTERN "export.h" EXCLUDE
|
||||
)
|
||||
endif()
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
Source: angle
|
||||
Version: 2017-06-14-8d471f-4
|
||||
Version: 2017-06-14-8d471f-5
|
||||
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.
|
||||
Build-Depends: egl-registry
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
Source: apr
|
||||
Version: 1.6.3
|
||||
Version: 1.6.5
|
||||
Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
|
||||
|
||||
@ -4,13 +4,13 @@ endif()
|
||||
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
set(VERSION 1.6.3)
|
||||
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 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
|
||||
SHA512 d3511e320457b5531f565813e626e7941f6b82864852db6aa03dd298a65dbccdcdc4bd580f5314f8be45d268388edab25efe88cf8340b7d2897a4dbe9d0a41fc
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
Source: args
|
||||
Version: 2018-02-23
|
||||
Version: 2018-10-25
|
||||
Description: A simple header-only C++ argument parser library.
|
||||
|
||||
@ -4,14 +4,19 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Taywee/args
|
||||
REF 7bf17000aa0969b8ca3178c72ec834b105944a41
|
||||
SHA512 38f038f2ea3cdbf62678112a28f6b9a2b46b7b291ec9a7c78393c28b1169dc393a086393f24534804188d434583896d9eaedca964c00a2db032fb337ebc9c214
|
||||
REF a82a9d6c94d7c58d8b96c65bdc1aba09a4f3e5db
|
||||
SHA512 0a7caf231117827eb2dbbca3d51259c701c1b8da61518565e5cfe379edd03f34a2dac2d35cdba659042e19e7b3076ef4b6aa6e01d2f9b66db59d1672f9f18f12
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
)
|
||||
|
||||
# Put the licence file where vcpkg expects it
|
||||
file(COPY ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/args)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/args/license ${CURRENT_PACKAGES_DIR}/share/args/copyright)
|
||||
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/args)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/args/LICENSE ${CURRENT_PACKAGES_DIR}/share/args/copyright)
|
||||
|
||||
# Copy the args header files
|
||||
file(INSTALL ${SOURCE_PATH}/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.hxx")
|
||||
|
||||
3
ports/argtable2/CONTROL
Normal file
3
ports/argtable2/CONTROL
Normal file
@ -0,0 +1,3 @@
|
||||
Source: argtable2
|
||||
Version: 2.13-1
|
||||
Description: Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.
|
||||
24
ports/argtable2/fix-install-dirs.patch
Normal file
24
ports/argtable2/fix-install-dirs.patch
Normal file
@ -0,0 +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})
|
||||
32
ports/argtable2/portfile.cmake
Normal file
32
ports/argtable2/portfile.cmake
Normal file
@ -0,0 +1,32 @@
|
||||
include(vcpkg_common_functions)
|
||||
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
|
||||
# Due to missing dllexport flags we export all symbols
|
||||
-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE
|
||||
-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)
|
||||
@ -1,4 +1,4 @@
|
||||
Source: arrow
|
||||
Version: 0.6.0-1
|
||||
Version: 0.9.0-1
|
||||
Build-Depends: boost-system, boost-filesystem, boost-multiprecision, boost-algorithm, flatbuffers, rapidjson, zlib, lz4, brotli, zstd, snappy, gflags
|
||||
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.
|
||||
|
||||
@ -1,51 +1,91 @@
|
||||
diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake
|
||||
index f2e714c..2e475dc 100644
|
||||
--- a/cmake_modules/FindBrotli.cmake
|
||||
+++ b/cmake_modules/FindBrotli.cmake
|
||||
@@ -65,16 +65,13 @@ if (BROTLI_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR BROTLI_LIBRARIES))
|
||||
diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake
|
||||
index ea971f0..3e98ede 100644
|
||||
--- a/cpp/cmake_modules/FindBrotli.cmake
|
||||
+++ b/cpp/cmake_modules/FindBrotli.cmake
|
||||
@@ -43,53 +43,31 @@ find_path( BROTLI_INCLUDE_DIR NAMES brotli/decode.h
|
||||
NO_DEFAULT_PATH
|
||||
PATH_SUFFIXES "include" )
|
||||
|
||||
-find_library( BROTLI_LIBRARY_ENC NAMES libbrotlienc.a libbrotlienc-static.a brotlienc
|
||||
+find_library( BROTLI_LIBRARY_ENC NAMES libbrotlienc libbrotlienc-static brotlienc brotlienc-static
|
||||
PATHS ${_brotli_roots}
|
||||
NO_DEFAULT_PATH
|
||||
PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" )
|
||||
|
||||
-find_library( BROTLI_LIBRARY_DEC NAMES libbrotlidec.a libbrotlidec-static.a brotlidec
|
||||
+find_library( BROTLI_LIBRARY_DEC NAMES libbrotlidec libbrotlidec-static brotlidec brotlidec-static
|
||||
PATHS ${_brotli_roots}
|
||||
NO_DEFAULT_PATH
|
||||
PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" )
|
||||
|
||||
-find_library( BROTLI_LIBRARY_COMMON NAMES libbrotlicommon.a libbrotlicommon-static.a brotlicommon
|
||||
+find_library( BROTLI_LIBRARY_COMMON NAMES libbrotlicommon libbrotlicommon-static brotlicommon brotlicommon-static
|
||||
PATHS ${_brotli_roots}
|
||||
NO_DEFAULT_PATH
|
||||
PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib" )
|
||||
|
||||
set(BROTLI_LIBRARIES ${BROTLI_LIBRARY_ENC} ${BROTLI_LIBRARY_DEC}
|
||||
${BROTLI_LIBRARY_COMMON})
|
||||
-
|
||||
+
|
||||
if (BROTLI_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR BROTLI_LIBRARIES))
|
||||
set(BROTLI_FOUND TRUE)
|
||||
get_filename_component( BROTLI_LIBS ${BROTLI_LIBRARY_ENC} PATH )
|
||||
set(BROTLI_LIB_NAME brotli)
|
||||
- if (MSVC AND NOT BROTLI_MSVC_STATIC_LIB_SUFFIX)
|
||||
- set(BROTLI_MSVC_STATIC_LIB_SUFFIX _static)
|
||||
- get_filename_component( BROTLI_LIBS ${BROTLI_LIBRARY_ENC} PATH )
|
||||
- set(BROTLI_LIB_NAME brotli)
|
||||
- if (BROTLI_MSVC_STATIC_LIB_SUFFIX)
|
||||
- set(BROTLI_STATIC_LIB_SUFFIX "${BROTLI_MSVC_STATIC_LIB_SUFFIX}")
|
||||
- endif()
|
||||
set(BROTLI_STATIC_LIB
|
||||
- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
- set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
- set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
- set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
+ ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
+ ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
+ ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
+ set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
+ set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
+ set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
set(BROTLI_SHARED_LIB
|
||||
${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
diff --git a/cmake_modules/FindFlatbuffers.cmake b/cmake_modules/FindFlatbuffers.cmake
|
||||
index 804f479..ff9bde1 100644
|
||||
--- a/cmake_modules/FindFlatbuffers.cmake
|
||||
+++ b/cmake_modules/FindFlatbuffers.cmake
|
||||
- if (NOT BROTLI_STATIC_LIB_SUFFIX)
|
||||
- if (EXISTS "${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc-static${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
||||
- set(BROTLI_STATIC_LIB_SUFFIX -static)
|
||||
- else()
|
||||
- if (MSVC)
|
||||
- set(BROTLI_STATIC_LIB_SUFFIX _static)
|
||||
- else()
|
||||
- set(BROTLI_STATIC_LIB_SUFFIX "")
|
||||
- endif()
|
||||
- endif()
|
||||
- endif()
|
||||
- set(BROTLI_STATIC_LIB
|
||||
- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
|
||||
- ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
- set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${BROTLI_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
- set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${BROTLI_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
- set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${BROTLI_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
- set(BROTLI_SHARED_LIB
|
||||
- ${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}enc${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- ${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}dec${CMAKE_SHARED_LIBRARY_SUFFIX}
|
||||
- ${BROTLI_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${BROTLI_LIB_NAME}common${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
+ set(BROTLI_STATIC_LIB ${BROTLI_LIBRARIES})
|
||||
+ set(BROTLI_STATIC_LIBRARY_ENC ${BROTLI_LIBRARY_ENC})
|
||||
+ set(BROTLI_STATIC_LIBRARY_DEC ${BROTLI_LIBRARY_DEC})
|
||||
+ set(BROTLI_STATIC_LIBRARY_COMMON ${BROTLI_LIBRARY_COMMON})
|
||||
+ set(BROTLI_SHARED_LIB ${BROTLI_LIBRARIES})
|
||||
else ()
|
||||
set(BROTLI_FOUND FALSE)
|
||||
endif ()
|
||||
diff --git a/cpp/cmake_modules/FindFlatbuffers.cmake b/cpp/cmake_modules/FindFlatbuffers.cmake
|
||||
index 804f479..baac84e 100644
|
||||
--- a/cpp/cmake_modules/FindFlatbuffers.cmake
|
||||
+++ b/cpp/cmake_modules/FindFlatbuffers.cmake
|
||||
@@ -53,6 +53,7 @@ endif ()
|
||||
|
||||
find_program(FLATBUFFERS_COMPILER flatc
|
||||
"${FLATBUFFERS_HOME}/bin"
|
||||
+ "${FLATBUFFERS_HOME}/tools"
|
||||
+ "${FLATBUFFERS_HOME}/tools/flatbuffers"
|
||||
/usr/local/bin
|
||||
/usr/bin
|
||||
NO_DEFAULT_PATH
|
||||
diff --git a/cmake_modules/FindLz4.cmake b/cmake_modules/FindLz4.cmake
|
||||
index 07707cf..9cbf67d 100644
|
||||
--- a/cmake_modules/FindLz4.cmake
|
||||
+++ b/cmake_modules/FindLz4.cmake
|
||||
@@ -29,15 +29,7 @@ elseif ( Lz4_HOME )
|
||||
diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake
|
||||
index 3a89c8d..3157197 100644
|
||||
--- a/cpp/cmake_modules/FindLz4.cmake
|
||||
+++ b/cpp/cmake_modules/FindLz4.cmake
|
||||
@@ -29,21 +29,11 @@ elseif ( Lz4_HOME )
|
||||
list( APPEND _lz4_roots ${Lz4_HOME} )
|
||||
endif()
|
||||
|
||||
-if (MSVC AND NOT LZ4_MSVC_STATIC_LIB_SUFFIX)
|
||||
-if (MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX)
|
||||
- set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static")
|
||||
-endif()
|
||||
-
|
||||
@ -54,14 +94,20 @@ index 07707cf..9cbf67d 100644
|
||||
-
|
||||
-set(LZ4_STATIC_LIB_NAME
|
||||
- ${CMAKE_STATIC_LIBRARY_PREFIX}lz4${LZ4_STATIC_LIB_SUFFIX})
|
||||
+set(LZ4_STATIC_LIB_NAME lz4)
|
||||
|
||||
-
|
||||
find_path(LZ4_INCLUDE_DIR NAMES lz4.h
|
||||
PATHS ${_lz4_roots}
|
||||
diff --git a/cmake_modules/FindSnappy.cmake b/cmake_modules/FindSnappy.cmake
|
||||
NO_DEFAULT_PATH
|
||||
PATH_SUFFIXES "include" )
|
||||
-find_library(LZ4_STATIC_LIB NAMES ${LZ4_STATIC_LIB_NAME} lib${LZ4_STATIC_LIB_NAME}
|
||||
+find_library(LZ4_STATIC_LIB NAMES lz4 liblz4
|
||||
PATHS ${_lz4_roots}
|
||||
NO_DEFAULT_PATH
|
||||
PATH_SUFFIXES "lib" )
|
||||
diff --git a/cpp/cmake_modules/FindSnappy.cmake b/cpp/cmake_modules/FindSnappy.cmake
|
||||
index 867963c..8a432db 100644
|
||||
--- a/cmake_modules/FindSnappy.cmake
|
||||
+++ b/cmake_modules/FindSnappy.cmake
|
||||
--- a/cpp/cmake_modules/FindSnappy.cmake
|
||||
+++ b/cpp/cmake_modules/FindSnappy.cmake
|
||||
@@ -55,7 +55,7 @@ if (SNAPPY_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR SNAPPY_LIBRARIES))
|
||||
set(SNAPPY_HEADER_NAME snappy.h)
|
||||
set(SNAPPY_HEADER ${SNAPPY_INCLUDE_DIR}/${SNAPPY_HEADER_NAME})
|
||||
@ -71,60 +117,31 @@ index 867963c..8a432db 100644
|
||||
set(SNAPPY_SHARED_LIB ${SNAPPY_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${SNAPPY_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
else ()
|
||||
set(SNAPPY_FOUND FALSE)
|
||||
diff --git a/cmake_modules/FindZLIB.cmake b/cmake_modules/FindZLIB.cmake
|
||||
index 78b84f2..eb09001 100644
|
||||
--- a/cmake_modules/FindZLIB.cmake
|
||||
+++ b/cmake_modules/FindZLIB.cmake
|
||||
@@ -62,11 +62,11 @@ if (ZLIB_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZLIB_LIBRARIES))
|
||||
diff --git a/cpp/cmake_modules/FindZLIB.cmake b/cpp/cmake_modules/FindZLIB.cmake
|
||||
index 78b84f2..56cc887 100644
|
||||
--- a/cpp/cmake_modules/FindZLIB.cmake
|
||||
+++ b/cpp/cmake_modules/FindZLIB.cmake
|
||||
@@ -61,9 +61,7 @@ if (ZLIB_INCLUDE_DIR AND (PARQUET_MINIMAL_DEPENDENCY OR ZLIB_LIBRARIES))
|
||||
set(ZLIB_HEADER ${ZLIB_INCLUDE_DIR}/${ZLIB_HEADER_NAME})
|
||||
set(ZLIB_LIB_NAME z)
|
||||
if (MSVC)
|
||||
if (NOT ZLIB_MSVC_STATIC_LIB_SUFFIX)
|
||||
- if (NOT ZLIB_MSVC_STATIC_LIB_SUFFIX)
|
||||
- set(ZLIB_MSVC_STATIC_LIB_SUFFIX libstatic)
|
||||
+ set(ZLIB_MSVC_STATIC_LIB_SUFFIX lib)
|
||||
endif()
|
||||
- endif()
|
||||
+ set(ZLIB_MSVC_STATIC_LIB_SUFFIX lib)
|
||||
set(ZLIB_MSVC_SHARED_LIB_SUFFIX lib)
|
||||
endif()
|
||||
- set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
+ set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_SHARED_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
set(ZLIB_SHARED_LIB ${ZLIB_LIBS}/${CMAKE_SHARED_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_SHARED_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
|
||||
else ()
|
||||
set(ZLIB_FOUND FALSE)
|
||||
diff --git a/cmake_modules/FindZSTD.cmake b/cmake_modules/FindZSTD.cmake
|
||||
index 02a0c39..73c61b5 100644
|
||||
--- a/cmake_modules/FindZSTD.cmake
|
||||
+++ b/cmake_modules/FindZSTD.cmake
|
||||
@@ -29,21 +29,11 @@ elseif ( ZStd_HOME )
|
||||
list( APPEND _zstd_roots ${ZStd_HOME} )
|
||||
endif()
|
||||
|
||||
-if (MSVC AND NOT ZSTD_MSVC_STATIC_LIB_SUFFIX)
|
||||
- set(ZSTD_MSVC_STATIC_LIB_SUFFIX "_static")
|
||||
-endif()
|
||||
-
|
||||
-set(ZSTD_STATIC_LIB_SUFFIX
|
||||
- "${ZSTD_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
||||
-
|
||||
-set(ZSTD_STATIC_LIB_NAME
|
||||
- ${CMAKE_STATIC_LIBRARY_PREFIX}zstd${ZSTD_STATIC_LIB_SUFFIX})
|
||||
-
|
||||
find_path(ZSTD_INCLUDE_DIR NAMES zstd.h
|
||||
set(ZLIB_STATIC_LIB ${ZLIB_LIBS}/${CMAKE_STATIC_LIBRARY_PREFIX}${ZLIB_LIB_NAME}${ZLIB_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||
diff --git a/cpp/cmake_modules/FindZSTD.cmake b/cpp/cmake_modules/FindZSTD.cmake
|
||||
index 810e5c0..b483471 100644
|
||||
--- a/cpp/cmake_modules/FindZSTD.cmake
|
||||
+++ b/cpp/cmake_modules/FindZSTD.cmake
|
||||
@@ -43,7 +43,7 @@ find_path(ZSTD_INCLUDE_DIR NAMES zstd.h
|
||||
PATHS ${_zstd_roots}
|
||||
NO_DEFAULT_PATH
|
||||
PATH_SUFFIXES "include" )
|
||||
-find_library(ZSTD_STATIC_LIB NAMES ${ZSTD_STATIC_LIB_NAME} lib${ZSTD_STATIC_LIB_NAME}
|
||||
+find_library(ZSTD_STATIC_LIB NAMES libzstd libzstd_static zstd zstd_static
|
||||
+find_library(ZSTD_STATIC_LIB NAMES zstd ${ZSTD_STATIC_LIB_NAME} lib${ZSTD_STATIC_LIB_NAME}
|
||||
PATHS ${_zstd_roots}
|
||||
NO_DEFAULT_PATH
|
||||
PATH_SUFFIXES "lib" )
|
||||
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
|
||||
index a888e92..0fe3629 100644
|
||||
--- a/cmake_modules/ThirdpartyToolchain.cmake
|
||||
+++ b/cmake_modules/ThirdpartyToolchain.cmake
|
||||
@@ -119,6 +119,7 @@ endif()
|
||||
set(Boost_DEBUG TRUE)
|
||||
set(Boost_USE_MULTITHREADED ON)
|
||||
set(Boost_ADDITIONAL_VERSIONS
|
||||
+ "1.65.0" "1.65"
|
||||
"1.64.0" "1.64"
|
||||
"1.63.0" "1.63"
|
||||
"1.62.0" "1.61"
|
||||
|
||||
@ -7,20 +7,19 @@ endif()
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO apache/arrow
|
||||
REF apache-arrow-0.6.0
|
||||
SHA512 c0e89b959dfe75e895a3427edd4eee663be5ee542e9ea13f7311d0775fe7a00188eafa07ba524e3d3c0a71fc8e11213f10fe4ebfdf451754816062249ffa7f3d
|
||||
REF apache-arrow-0.9.0
|
||||
SHA512 789d0948eee3af20eb922e09c14eb721f20fa041ca3c0cf57bd869718fc9919b45590bd72714efafdf19196f35abb6bdbe0a3972ca74fcc2af92c1f9ade8fa00
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
set(CPP_SOURCE_PATH "${SOURCE_PATH}/cpp")
|
||||
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${CPP_SOURCE_PATH}
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PATCHES
|
||||
"${CMAKE_CURRENT_LIST_DIR}/all.patch"
|
||||
)
|
||||
|
||||
|
||||
string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" ARROW_BUILD_SHARED)
|
||||
string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" ARROW_BUILD_STATIC)
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
Source: asio
|
||||
Version: 1.12.0-2
|
||||
Version: 1.12.1-1
|
||||
Description: Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.
|
||||
|
||||
@ -4,14 +4,13 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO chriskohlhoff/asio
|
||||
REF asio-1-12-0
|
||||
SHA512 a0e341fd6a848784e1533df84d1e6b361c8468f59d4fbde68c1500c1f8a2124ad78db0169098dbbc594ce26717eb9760f37af13cb288a549e2bda563eecf2be3
|
||||
REF asio-1-12-1
|
||||
SHA512 e335eea05c27a72faae95dd5d5ca997ac8bb144cd5fb68e5538129ea6afb3b4d88e2be1c31a1effdbbbe4c93e07ee274a7e5817453c29faf56abf9ab692b2dd6
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
# Handle copyright
|
||||
file(COPY ${SOURCE_PATH}/asio/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
|
||||
file(INSTALL ${SOURCE_PATH}/asio/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
|
||||
# Copy the asio header files
|
||||
file(INSTALL ${SOURCE_PATH}/asio/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp" PATTERN "*.ipp")
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
Source: asmjit
|
||||
Version: 673dcefaa048c5f5a2bf8b85daf8f7b9978d018a
|
||||
Version: 2018-11-08
|
||||
Description: Complete x86/x64 JIT and Remote Assembler for C++
|
||||
|
||||
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO asmjit/asmjit
|
||||
REF 673dcefaa048c5f5a2bf8b85daf8f7b9978d018a
|
||||
SHA512 f3cf4b603424ec0bf7e00463ad94e157bd549265730be66e5e29af31182ca3a6a318ff4c1b1d0fcd2595163df51ad6d34041583b8cbe73be1155562739c25555
|
||||
REF 771d66b301e60ebc3ffa69b11765622c547df6ab
|
||||
SHA512 02ae822a33d50810fc0833b647bd6c29851b147ae4e388fd29d54567e6ed928173b961d3f3f323b243719092c2947bd6f374bc5d6051817e8153688868473830
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Source: assimp
|
||||
Version: 4.1.0-1
|
||||
Version: 4.1.0-3
|
||||
Description: The Open Asset import library
|
||||
Build-Depends: zlib
|
||||
Build-Depends: zlib, rapidjson
|
||||
|
||||
@ -6,26 +6,33 @@ vcpkg_from_github(
|
||||
REF v4.1.0
|
||||
SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PATCHES
|
||||
"${CMAKE_CURRENT_LIST_DIR}/dont-overwrite-prefix-path.patch"
|
||||
"${CMAKE_CURRENT_LIST_DIR}/uninitialized-variable.patch"
|
||||
dont-overwrite-prefix-path.patch
|
||||
uninitialized-variable.patch
|
||||
)
|
||||
|
||||
file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake)
|
||||
file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib ${SOURCE_PATH}/contrib/gtest ${SOURCE_PATH}/contrib/rapidjson)
|
||||
|
||||
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
|
||||
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS -DASSIMP_BUILD_TESTS=OFF
|
||||
-DASSIMP_BUILD_ASSIMP_VIEW=OFF
|
||||
-DASSIMP_BUILD_ZLIB=OFF
|
||||
-DASSIMP_BUILD_ASSIMP_TOOLS=OFF
|
||||
-DASSIMP_INSTALL_PDB=OFF
|
||||
-DZLIB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
|
||||
-DZLIB_FOUND=1
|
||||
OPTIONS_RELEASE
|
||||
-DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/lib/zlib.lib
|
||||
-DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/lib/zlib.lib
|
||||
OPTIONS_DEBUG
|
||||
-DZLIB_LIBRARIES=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib
|
||||
-DZLIB_LIBRARY=${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
@ -40,10 +47,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimp-config.cmake ASSIMP_CONFIG)
|
||||
string(REPLACE "get_filename_component(ASSIMP_ROOT_DIR \"\${_PREFIX}\" PATH)"
|
||||
"set(ASSIMP_ROOT_DIR \${_PREFIX})" ASSIMP_CONFIG ${ASSIMP_CONFIG})
|
||||
string(REPLACE "assimp\${ASSIMP_LIBRARY_SUFFIX}"
|
||||
"assimp\${ASSIMP_LIBRARY_SUFFIX}.lib" ASSIMP_CONFIG ${ASSIMP_CONFIG})
|
||||
string(REPLACE "set( ASSIMP_LIBRARIES \${ASSIMP_LIBRARIES})"
|
||||
"set( ASSIMP_LIBRARIES \${ASSIMP_LIBRARY_DIRS}/\${ASSIMP_LIBRARIES})" ASSIMP_CONFIG ${ASSIMP_CONFIG})
|
||||
"set( ASSIMP_LIBRARIES optimized \${ASSIMP_LIBRARY_DIRS}/\${ASSIMP_LIBRARIES}.lib debug \${ASSIMP_LIBRARY_DIRS}/../debug/lib/\${ASSIMP_LIBRARIES}d.lib)" ASSIMP_CONFIG ${ASSIMP_CONFIG})
|
||||
file(WRITE ${CURRENT_PACKAGES_DIR}/share/assimp/assimp-config.cmake "${ASSIMP_CONFIG}")
|
||||
|
||||
# Handle copyright
|
||||
|
||||
3
ports/asyncplusplus/CONTROL
Normal file
3
ports/asyncplusplus/CONTROL
Normal file
@ -0,0 +1,3 @@
|
||||
Source: asyncplusplus
|
||||
Version: 1.0-1
|
||||
Description: Async++ is a lightweight concurrency framework for C++11
|
||||
34
ports/asyncplusplus/portfile.cmake
Normal file
34
ports/asyncplusplus/portfile.cmake
Normal file
@ -0,0 +1,34 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Amanieu/asyncplusplus
|
||||
REF v1.0
|
||||
SHA512 bb1fc032d2d8de49b4505e0629d48e5cfa99edfcafbf17848f160ceb320bcd993f1549095248d1a0ef8fc1ec07ecbaad6b634a770ddc1974092d373a508a5fe3
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/Async++.cmake ${CURRENT_PACKAGES_DIR}/cmake/Async++Targets.cmake)
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/async++)
|
||||
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/async++/Async++Targets.cmake ${CURRENT_PACKAGES_DIR}/share/async++/Async++.cmake)
|
||||
|
||||
file(READ ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake _contents)
|
||||
file(WRITE ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake "include(CMakeFindDependencyMacro)\n${_contents}")
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/asyncplusplus)
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/LICENSE ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/copyright)
|
||||
|
||||
vcpkg_test_cmake(PACKAGE_NAME Async++)
|
||||
@ -1,8 +1,8 @@
|
||||
Source: aws-sdk-cpp
|
||||
Version: 1.4.33
|
||||
Version: 1.6.47
|
||||
Description: AWS SDK for C++
|
||||
Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
|
||||
Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs
|
||||
Default-Features: dynamodb, s3, kinesis
|
||||
# Automatically generated by generateFeatures.ps1
|
||||
|
||||
Feature: access-management
|
||||
|
||||
@ -2,4 +2,4 @@ Source: aws-sdk-cpp
|
||||
Version: 1.4.30-1
|
||||
Description: AWS SDK for C++
|
||||
Build-Depends: openssl (!uwp&!windows), curl (!uwp&!windows)
|
||||
Default-Features: dynamodb, ec2, kms, rds, s3, sns, sqs
|
||||
Default-Features: dynamodb, s3, kinesis
|
||||
|
||||
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO aws/aws-sdk-cpp
|
||||
REF 1.4.33
|
||||
SHA512 ebe8e402107b7b70a9b397c94ad981ff02d97e10e6fd8337f19b732185ecbb79e132eecd513300ce733a765fd780dd765c1d2b34479e5e1d891fa771722bad81
|
||||
REF 1.6.47
|
||||
SHA512 84d8ec8672f5de97735587aa25af410e77a4e827648379ab9683911133c2a05517e0a435fa1b8e0931cae8aa8f0e74500fa8ed8e75d493171919dfcc665bbf1c
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
Source: azure-c-shared-utility
|
||||
Version: 1.1.3
|
||||
Version: 1.1.11-1
|
||||
Description: Azure C SDKs common code
|
||||
Build-Depends: curl (linux), openssl (linux)
|
||||
|
||||
@ -1,20 +1,15 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
message("azure-c-shared-utility only supports static linkage")
|
||||
set(VCPKG_LIBRARY_LINKAGE "static")
|
||||
endif()
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-c-shared-utility
|
||||
REF 1.1.3
|
||||
SHA512 8c69f39ccca30d11a7e665a46e3ec33826af062657a87d32f68e80c6182b15d5e02839f9e541f5dc840219e3256ac090452f4873b6a1a62b3fe6682780314056
|
||||
REF bcf6393b1ce3cecf0fcdf8988621fd6e4d414df3
|
||||
SHA512 e5ae3c895777df90e725da7686939b46fa4df19ce5626bbe13a5aaf1b844ee56c96ddf2a9ad8426a96cdc34e8be338c95b6759e618143e19445c5180fb0f7ed1
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_AS_DYNAMIC)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
@ -22,7 +17,7 @@ vcpkg_configure_cmake(
|
||||
-Dskip_samples=ON
|
||||
-Duse_installed_dependencies=ON
|
||||
-Duse_default_uuid=ON
|
||||
-Dbuild_as_dynamic=${BUILD_AS_DYNAMIC}
|
||||
-Dbuild_as_dynamic=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
@ -33,8 +28,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR
|
||||
|
||||
file(COPY ${SOURCE_PATH}/configs/azure_iot_build_rules.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-c-shared-utility)
|
||||
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/LICENSE
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-c-shared-utility RENAME copyright)
|
||||
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-c-shared-utility/copyright COPYONLY)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Source: azure-iot-sdk-c
|
||||
Version: 1.2.3
|
||||
Version: 1.2.11-1
|
||||
Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson
|
||||
Description: A C99 SDK for connecting devices to Microsoft Azure IoT services
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index aa2dfad..f1656ea 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -129,15 +129,6 @@ endif()
|
||||
#Use solution folders.
|
||||
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||||
|
||||
-# build the parson library for json parsing
|
||||
-add_library(parson
|
||||
- ./deps/parson/parson.c
|
||||
- ./deps/parson/parson.h
|
||||
-)
|
||||
-if(MSVC)
|
||||
- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")
|
||||
-endif()
|
||||
-
|
||||
if(IN_OPENWRT)
|
||||
ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
|
||||
INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
|
||||
@ -1,3 +1,25 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a8011fb..9fc05c7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -155,17 +155,6 @@ endif()
|
||||
# Use solution folders.
|
||||
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||||
|
||||
-# build the parson library for json parsing
|
||||
-add_library(parson
|
||||
- ./deps/parson/parson.c
|
||||
- ./deps/parson/parson.h
|
||||
-)
|
||||
-if (MSVC)
|
||||
- set_source_files_properties(../deps/parson/parson.c PROPERTIES COMPILE_FLAGS "/wd4244 /wd4232")
|
||||
-endif()
|
||||
-set(parson_h_install_files ./deps/parson/parson.h)
|
||||
-set(parson_install_libs parson)
|
||||
-
|
||||
if (IN_OPENWRT)
|
||||
ADD_DEFINITIONS("$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
|
||||
INCLUDE_DIRECTORIES("$ENV{TOOLCHAIN_DIR}/usr/include" "$ENV{TARGET_LDFLAGS}" "$ENV{TARGET_CPPFLAGS}" "$ENV{TARGET_CFLAGS}")
|
||||
diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake
|
||||
index b9c62e8..edf5847 100644
|
||||
--- a/configs/azure_iot_sdksConfig.cmake
|
||||
@ -14,16 +36,17 @@ index b9c62e8..edf5847 100644
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake")
|
||||
|
||||
diff --git a/dependencies.cmake b/dependencies.cmake
|
||||
index 063733a..71bfc7d 100644
|
||||
index fd06df6..c0e06fa 100644
|
||||
--- a/dependencies.cmake
|
||||
+++ b/dependencies.cmake
|
||||
@@ -18,6 +18,8 @@ if(${use_installed_dependencies})
|
||||
endif()
|
||||
endif()
|
||||
@@ -18,6 +18,9 @@ if(${use_installed_dependencies})
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
+ find_package(unofficial-parson REQUIRED)
|
||||
+ link_libraries(unofficial::parson::parson)
|
||||
else()
|
||||
+
|
||||
else ()
|
||||
add_subdirectory(c-utility)
|
||||
|
||||
diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
|
||||
@ -78,10 +101,10 @@ index d05d654..5872c8d 100644
|
||||
)
|
||||
|
||||
diff --git a/iothub_service_client/CMakeLists.txt b/iothub_service_client/CMakeLists.txt
|
||||
index 11a9a9a..4097293 100644
|
||||
index e47473e..b073513 100644
|
||||
--- a/iothub_service_client/CMakeLists.txt
|
||||
+++ b/iothub_service_client/CMakeLists.txt
|
||||
@@ -72,9 +72,7 @@ endif()
|
||||
@@ -81,9 +81,7 @@ endif()
|
||||
setSdkTargetBuildProperties(iothub_service_client)
|
||||
|
||||
if(NOT ${nuget_e2e_tests})
|
||||
|
||||
@ -1,29 +1,18 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
message("azure-iot-sdk-c only supports static linkage")
|
||||
set(VCPKG_LIBRARY_LINKAGE "static")
|
||||
endif()
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-iot-sdk-c
|
||||
REF 1.2.3
|
||||
SHA512 6192d454bb2ecb01989f7636751acd6919021b55b772f4ea25a6d0ddd263e7f988275f7fb0b1c304d4ebd30418c9f870eb1c504a4a504f2faeb712ef8e669d5a
|
||||
REF acff8b1677150cb165a7b111745144cf8fab76cc
|
||||
SHA512 7e7e0679d48e76539a607a593b1c9ccc57eeb4f8bf33fb49051ad99203d1568f0ac2a38fe32ba0b3670cea32a2318e8c135c709ba5712f95cd8005ff21572e28
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PATCHES
|
||||
${CMAKE_CURRENT_LIST_DIR}/improve-external-deps.patch
|
||||
${CMAKE_CURRENT_LIST_DIR}/improve-external-deps-2.patch
|
||||
PATCHES improve-external-deps.patch
|
||||
)
|
||||
|
||||
file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_AS_DYNAMIC)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
@ -31,7 +20,7 @@ vcpkg_configure_cmake(
|
||||
-Dskip_samples=ON
|
||||
-Duse_installed_dependencies=ON
|
||||
-Duse_default_uuid=ON
|
||||
-Dbuild_as_dynamic=${BUILD_AS_DYNAMIC}
|
||||
-Dbuild_as_dynamic=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
@ -40,8 +29,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/azure_iot_sdks)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/LICENSE
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-iot-sdk-c RENAME copyright)
|
||||
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-iot-sdk-c/copyright COPYONLY)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Source: azure-storage-cpp
|
||||
Version: 3.2.1
|
||||
Build-Depends: cpprestsdk, atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), glibmm (!windows&!uwp), libxmlpp (!windows&!uwp), libuuid (!windows&!uwp)
|
||||
Version: 5.2.0
|
||||
Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp)
|
||||
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. Microsoft Azure Storage team's blog - http://blogs.msdn.com/b/windowsazurestorage/
|
||||
|
||||
@ -1,169 +0,0 @@
|
||||
diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
|
||||
index 07878c2..8d1c47e 100644
|
||||
--- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
|
||||
+++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
|
||||
@@ -51,20 +51,25 @@ if(UNIX)
|
||||
find_package(UnitTest++ REQUIRED)
|
||||
endif()
|
||||
|
||||
- option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
|
||||
|
||||
- file(GLOB WAS_HEADERS includes/was/*.h)
|
||||
- install(FILES ${WAS_HEADERS} DESTINATION include/was)
|
||||
- file(GLOB WASCORE_HEADERS includes/wascore/*.h)
|
||||
- install(FILES ${WASCORE_HEADERS} DESTINATION include/wascore)
|
||||
- file(GLOB WASCORE_DATA includes/wascore/*.dat)
|
||||
- install(FILES ${WASCORE_DATA} DESTINATION include/wascore)
|
||||
+elseif(WIN32)
|
||||
+ message("-- Setting WIN32 options")
|
||||
+ find_package(Casablanca REQUIRED)
|
||||
+ add_definitions(-DUNICODE -D_UNICODE -D_WIN32)
|
||||
else()
|
||||
message("-- Unsupported Build Platform.")
|
||||
endif()
|
||||
|
||||
+option(BUILD_SHARED_LIBS "Build shared Libraries." ON)
|
||||
+option(WASTORE_INSTALL_HEADERS "Install header files." ON)
|
||||
+if(WASTORE_INSTALL_HEADERS)
|
||||
+ file(GLOB WAS_HEADERS includes/was/*.h)
|
||||
+ file(GLOB WASCORE_HEADERS includes/wascore/basic_types.h includes/wascore/constants.h)
|
||||
+ file(GLOB WASCORE_DATA includes/wascore/*.dat)
|
||||
+endif()
|
||||
+
|
||||
# Compiler (not platform) specific settings
|
||||
-if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
|
||||
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
||||
message("-- Setting gcc options")
|
||||
|
||||
set(WARNINGS "-Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code")
|
||||
@@ -81,22 +86,29 @@ if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
|
||||
add_definitions(-DBOOST_LOG_DYN_LINK)
|
||||
endif()
|
||||
add_definitions(-D_TURN_OFF_PLATFORM_STRING)
|
||||
-elseif((CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
|
||||
- message("-- Setting clang options")
|
||||
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
+ message("-- Setting clang options")
|
||||
|
||||
- set(WARNINGS "-Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls")
|
||||
- set(OSX_SUPPRESSIONS "-Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs")
|
||||
- set(WARNINGS "${WARNINGS} ${OSX_SUPPRESSIONS}")
|
||||
+ set(WARNINGS "-Wall -Wextra -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls")
|
||||
+ set(OSX_SUPPRESSIONS "-Wno-overloaded-virtual -Wno-sign-conversion -Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-char-subscripts -Wno-switch -Wno-unused-parameter -Wno-unused-variable -Wno-deprecated -Wno-unused-value -Wno-unknown-warning-option -Wno-return-type-c-linkage -Wno-unused-function -Wno-sign-compare -Wno-shorten-64-to-32 -Wno-reorder -Wno-unused-local-typedefs")
|
||||
+ set(WARNINGS "${WARNINGS} ${OSX_SUPPRESSIONS}")
|
||||
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
|
||||
- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
|
||||
- set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-return-type-c-linkage -Wno-unneeded-internal-declaration")
|
||||
+ set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
|
||||
+ set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
|
||||
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
|
||||
- if (BUILD_SHARED_LIBS)
|
||||
- add_definitions(-DBOOST_LOG_DYN_LINK)
|
||||
- endif()
|
||||
- add_definitions(-D_TURN_OFF_PLATFORM_STRING)
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
|
||||
+ if (BUILD_SHARED_LIBS)
|
||||
+ add_definitions(-DBOOST_LOG_DYN_LINK)
|
||||
+ endif()
|
||||
+ add_definitions(-D_TURN_OFF_PLATFORM_STRING)
|
||||
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
||||
+ message("-- Setting MSVC options")
|
||||
+ add_compile_options(/bigobj)
|
||||
+ add_compile_options(/MP)
|
||||
+ if(BUILD_SHARED_LIBS)
|
||||
+ add_definitions(-DWASTORAGE_DLL -D_USRDLL)
|
||||
+ endif()
|
||||
else()
|
||||
message("-- Unknown compiler, success is doubtful.")
|
||||
endif()
|
||||
@@ -109,7 +121,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
|
||||
set(AZURESTORAGE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/includes)
|
||||
set(AZURESTORAGE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/includes ${CASABLANCA_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} ${LibXML++_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${Glibmm_INCLUDE_DIRS})
|
||||
|
||||
-
|
||||
set(AZURESTORAGE_LIBRARY azurestorage)
|
||||
set(AZURESTORAGE_LIBRARIES ${AZURESTORAGE_LIBRARY} ${CASABLANCA_LIBRARIES} ${Boost_LIBRARIES} ${Boost_FRAMEWORK} ${OPENSSL_LIBRARIES} ${LibXML++_LIBRARIES} ${UUID_LIBRARIES} ${Glibmm_LIBRARIES})
|
||||
|
||||
diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
|
||||
index 5c1df3c..da66eb4 100644
|
||||
--- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
|
||||
+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
|
||||
@@ -27,6 +27,7 @@ find_path(CASABLANCA_INCLUDE_DIR
|
||||
find_library(CASABLANCA_LIBRARY
|
||||
NAMES
|
||||
cpprest
|
||||
+ cpprest_2_9.lib
|
||||
PATHS
|
||||
${CASABLANCA_PKGCONF_LIBRARY_DIRS}
|
||||
${CASABLANCA_DIR}
|
||||
diff --git a/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
|
||||
index b08111f..74ba2fb 100644
|
||||
--- a/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
|
||||
+++ b/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
|
||||
@@ -2,7 +2,7 @@ include_directories(${Boost_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
|
||||
include_directories(${AZURESTORAGE_INCLUDE_DIRS})
|
||||
|
||||
# THE ORDER OF FILES IS VERY /VERY/ IMPORTANT
|
||||
-if(UNIX)
|
||||
+if(UNIX OR WIN32)
|
||||
set(SOURCES
|
||||
xmlhelpers.cpp
|
||||
response_parsers.cpp
|
||||
@@ -64,24 +64,46 @@ if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
|
||||
endif()
|
||||
if (APPLE)
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS}")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS}")
|
||||
else()
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||
+endif()
|
||||
+
|
||||
+if(MSVC)
|
||||
+ add_compile_options(/Yustdafx.h)
|
||||
+ set_source_files_properties(stdafx.cpp PROPERTIES COMPILE_FLAGS "/Ycstdafx.h")
|
||||
+
|
||||
+ if (NOT CMAKE_GENERATOR MATCHES "Visual Studio .*")
|
||||
+ set_property(SOURCE stdafx.cpp APPEND PROPERTY OBJECT_OUTPUTS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
|
||||
+ set_property(SOURCE ${SOURCES} APPEND PROPERTY OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/stdafx.pch")
|
||||
+ endif()
|
||||
+
|
||||
+ list(APPEND SOURCES stdafx.cpp)
|
||||
endif()
|
||||
|
||||
add_library(${AZURESTORAGE_LIBRARY} ${SOURCES})
|
||||
|
||||
target_link_libraries(${AZURESTORAGE_LIBRARIES})
|
||||
+if(WIN32)
|
||||
+ target_link_libraries(${AZURESTORAGE_LIBRARY} Ws2_32.lib rpcrt4.lib xmllite.lib bcrypt.lib)
|
||||
+endif()
|
||||
|
||||
# Portions specific to azure storage binary versioning and installation.
|
||||
if(UNIX)
|
||||
set_target_properties(${AZURESTORAGE_LIBRARY} PROPERTIES
|
||||
SOVERSION ${AZURESTORAGE_VERSION_MAJOR}
|
||||
VERSION ${AZURESTORAGE_VERSION_MAJOR}.${AZURESTORAGE_VERSION_MINOR})
|
||||
-
|
||||
- install(
|
||||
- TARGETS ${AZURESTORAGE_LIBRARY}
|
||||
- LIBRARY DESTINATION lib
|
||||
- ARCHIVE DESTINATION lib
|
||||
- )
|
||||
+elseif(WIN32)
|
||||
+ set_target_properties(${AZURESTORAGE_LIBRARY} PROPERTIES OUTPUT_NAME "wastorage")
|
||||
endif()
|
||||
+
|
||||
+install(FILES ${WAS_HEADERS} DESTINATION include/was)
|
||||
+install(FILES ${WASCORE_HEADERS} DESTINATION include/wascore)
|
||||
+install(FILES ${WASCORE_DATA} DESTINATION include/wascore)
|
||||
+
|
||||
+install(
|
||||
+ TARGETS ${AZURESTORAGE_LIBRARY}
|
||||
+ RUNTIME DESTINATION bin
|
||||
+ LIBRARY DESTINATION lib
|
||||
+ ARCHIVE DESTINATION lib
|
||||
+)
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake
|
||||
index 79a4bcb..fe130bd 100644
|
||||
--- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake
|
||||
+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindGlibmm.cmake
|
||||
@@ -36,7 +36,7 @@ find_path(GlibmmConfig_INCLUDE_DIR
|
||||
)
|
||||
|
||||
find_library(Glibmm_LIBRARY
|
||||
- NAMES glibmm-2.4
|
||||
+ NAMES glibmm glibmm-2.4
|
||||
PATHS
|
||||
${Glibmm_PKGCONF_LIBRARY_DIRS}
|
||||
/usr
|
||||
@ -7,14 +7,10 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-storage-cpp
|
||||
REF v3.2.1
|
||||
SHA512 8d1e8de439e52f53eb28b77e8adf394468f4861c2c4c1f79ec1437c72e3fc0bc871e4e2662ee58090748915b0f12ce6736a7cc6ede619d332686b9fb6a026c9f
|
||||
REF v5.2.0
|
||||
SHA512 345ddfcececc7b38e65dff96c971eadc41ce7255131f1bc9995dd8fed0c69cc3b48c6838152e30c57014bf2017bde0c819a09b7d6b4abaa089a7ae023633262e
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
${CMAKE_CURRENT_LIST_DIR}/cmake.patch
|
||||
${CMAKE_CURRENT_LIST_DIR}/static-builds.patch
|
||||
${CMAKE_CURRENT_LIST_DIR}/support-cpprest-findpackage.patch
|
||||
${CMAKE_CURRENT_LIST_DIR}/glibmm-cmake.patch
|
||||
${CMAKE_CURRENT_LIST_DIR}/pplx-do-while.patch
|
||||
)
|
||||
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
|
||||
index 8d1c47e..3b4d1c0 100644
|
||||
--- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
|
||||
+++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
|
||||
@@ -108,6 +108,8 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
||||
add_compile_options(/MP)
|
||||
if(BUILD_SHARED_LIBS)
|
||||
add_definitions(-DWASTORAGE_DLL -D_USRDLL)
|
||||
+ else()
|
||||
+ add_definitions(-D_NO_WASTORAGE_API)
|
||||
endif()
|
||||
else()
|
||||
message("-- Unknown compiler, success is doubtful.")
|
||||
@ -1,32 +0,0 @@
|
||||
diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
|
||||
index 3b4d1c0..d8818ac 100644
|
||||
--- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
|
||||
+++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
|
||||
-cmake_minimum_required(VERSION 2.6)
|
||||
+cmake_minimum_required(VERSION 3.8)
|
||||
project(azurestorage)
|
||||
|
||||
enable_testing()
|
||||
diff --git a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
|
||||
index da66eb4..40e1767 100644
|
||||
--- a/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
|
||||
+++ b/Microsoft.WindowsAzure.Storage/cmake/Modules/FindCasablanca.cmake
|
||||
@@ -23,6 +23,16 @@ find_path(CASABLANCA_INCLUDE_DIR
|
||||
include
|
||||
)
|
||||
|
||||
+find_package(cpprestsdk)
|
||||
+
|
||||
+if(cpprestsdk_FOUND)
|
||||
+ set(CASABLANCA_LIBRARY cpprestsdk::cpprest)
|
||||
+ set(CASABLANCA_PROCESS_LIBS CASABLANCA_LIBRARY)
|
||||
+ set(CASABLANCA_PROCESS_INCLUDES CASABLANCA_INCLUDE_DIR)
|
||||
+ libfind_process(CASABLANCA)
|
||||
+ return()
|
||||
+endif()
|
||||
+
|
||||
# Library
|
||||
find_library(CASABLANCA_LIBRARY
|
||||
NAMES
|
||||
@ -1,4 +1,4 @@
|
||||
Source: azure-uamqp-c
|
||||
Version: 1.2.3
|
||||
Version: 1.2.11-1
|
||||
Build-Depends: azure-c-shared-utility
|
||||
Description: AMQP library for C
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index dbf79e5..aec44e5 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -74,7 +74,8 @@ if(WIN32)
|
||||
include_directories($ENV{OpenSSLDir}/include)
|
||||
endif()
|
||||
|
||||
-set(uamqp_h_files
|
||||
+file(GLOB uamqp_h_files
|
||||
+ ./inc/azure_uamqp_c/*
|
||||
./inc/azure_uamqp_c/amqp_definitions.h
|
||||
./inc/azure_uamqp_c/amqp_frame_codec.h
|
||||
./inc/azure_uamqp_c/amqp_management.h
|
||||
@ -1,31 +1,24 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
message("azure-uamqp-c only supports static linkage")
|
||||
set(VCPKG_LIBRARY_LINKAGE "static")
|
||||
endif()
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-uamqp-c
|
||||
REF 1.2.3
|
||||
SHA512 18fc978517371fcb19e1c078f07d06b3bf8ec046c5cba955dd3cfe0a364d8775542acc970d81fa42384942ea4db7fb60d8939e80e90baf582c9d9e6ff0b577b5
|
||||
REF 075b5a669f49b9d3b68b7bf9b465fe92e1c740aa
|
||||
SHA512 54b7c9ebdaca13d44634e99a064aac54e9eadaedcbed723aabc62c70414ef54d62c5f58ddc836e8020eba4ca0d03d27c2d73391d4071f973fda228866215ec58
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/glob-headers.patch)
|
||||
|
||||
file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_AS_DYNAMIC)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-Dskip_samples=ON
|
||||
-Duse_installed_dependencies=ON
|
||||
-Dbuild_as_dynamic=${BUILD_AS_DYNAMIC}
|
||||
-Dbuild_as_dynamic=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
@ -34,8 +27,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uamqp)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/LICENSE
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-uamqp-c RENAME copyright)
|
||||
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-uamqp-c/copyright COPYONLY)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Source: azure-uhttp-c
|
||||
Version: 2018-02-09
|
||||
Version: 1.1.11-2
|
||||
Build-Depends: azure-c-shared-utility
|
||||
Description: Azure HTTP Library written in C
|
||||
|
||||
@ -1,29 +1,24 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
message("azure-uhttp-c only supports static linkage")
|
||||
set(VCPKG_LIBRARY_LINKAGE "static")
|
||||
endif()
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-uhttp-c
|
||||
REF 2018-02-09
|
||||
SHA512 0668be0f7624d021b6d24e81c21c606ab4a59990eb3d83fea6d2c6cf9ea3f2c6904ad021afcf9645c3c5f2238e9b83146f36522c662b0a2626d928cb4a0218ba
|
||||
REF ed7d104c4ab96aaa68e429066953874f12be70eb
|
||||
SHA512 512f8fd46dbc40ff79ffdbc2ea881a29aaa72db4c36f16f96f30a224220183e295d8e39a4965d788f92f4976fa6d37b197c04b32bbd187d456d5c5d516b95c9f
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_AS_DYNAMIC)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-Dskip_samples=ON
|
||||
-Duse_installed_dependencies=ON
|
||||
-Dbuild_as_dynamic=${BUILD_AS_DYNAMIC}
|
||||
-Dbuild_as_dynamic=OFF
|
||||
-DCMAKE_INSTALL_INCLUDEDIR=include
|
||||
)
|
||||
|
||||
@ -33,8 +28,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uhttp)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/LICENSE
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-uhttp-c RENAME copyright)
|
||||
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-uhttp-c/copyright COPYONLY)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Source: azure-umqtt-c
|
||||
Version: 1.1.3
|
||||
Version: 1.1.11-1
|
||||
Build-Depends: azure-c-shared-utility
|
||||
Description: General purpose library for communication over the mqtt protocol
|
||||
|
||||
@ -1,29 +1,24 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
message("azure-umqtt-c only supports static linkage")
|
||||
set(VCPKG_LIBRARY_LINKAGE "static")
|
||||
endif()
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Azure/azure-umqtt-c
|
||||
REF 1.1.3
|
||||
SHA512 5c57fe40dce8166e1e138db45b642152a337dbbbc4d85998ac99b016627c0135b99bd7b189d249c6278837ef4af5ba4e4f964a9b65788acef37d7b37ae125b16
|
||||
REF ff05514c9b4742ae8d7785719a399a7fe6eac09b
|
||||
SHA512 d750390d38555ab00e5d5cc5aa0b07ae452afd2e2af0dade5fc1c55f63ad367688b5ff7e97e65ab00f0153340b8bcc1e5039e80e5795b9f9c0cd2c48eedad081
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_AS_DYNAMIC)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-Dskip_samples=ON
|
||||
-Duse_installed_dependencies=ON
|
||||
-Dbuild_as_dynamic=${BUILD_AS_DYNAMIC}
|
||||
-Dbuild_as_dynamic=OFF
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
@ -32,8 +27,6 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/umqtt)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
file(INSTALL
|
||||
${SOURCE_PATH}/LICENSE
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/share/azure-umqtt-c RENAME copyright)
|
||||
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/azure-umqtt-c/copyright COPYONLY)
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
3
ports/bde/CONTROL
Normal file
3
ports/bde/CONTROL
Normal file
@ -0,0 +1,3 @@
|
||||
Source: bde
|
||||
Version: 3.2.0.0
|
||||
Description: Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.
|
||||
141
ports/bde/portfile.cmake
Normal file
141
ports/bde/portfile.cmake
Normal file
@ -0,0 +1,141 @@
|
||||
include(vcpkg_common_functions)
|
||||
set(BDE_VERSION 3.2.0.0)
|
||||
set(BDE_TOOLS_VERSION 1.x)
|
||||
|
||||
# Paths used in build
|
||||
set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bde-${BDE_VERSION})
|
||||
set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bde-${BDE_VERSION})
|
||||
|
||||
# Acquire Python 2 and add it to PATH
|
||||
vcpkg_find_acquire_program(PYTHON2)
|
||||
get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
|
||||
|
||||
# Acquire BDE Tools and add them to PATH
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH TOOLS_PATH
|
||||
REPO "bloomberg/bde-tools"
|
||||
REF d4b1a7670829228f4ec81ecdccc598ce03ae8e80
|
||||
SHA512 80af734c080adb225d5369157301ae0af18e02b1912351e34d23f5f2ba4e19f9ae2b5a367923f036330c9f9afd11a90cdf12680eb3e59b4297a312a1b713f17f
|
||||
HEAD_REF master
|
||||
)
|
||||
message(STATUS "Configure bde-tools-v${BDE_TOOLS_VERSION}")
|
||||
if(VCPKG_CMAKE_SYSTEM_NAME)
|
||||
set(ENV{PATH} "$ENV{PATH}:${PYTHON2_EXE_PATH}")
|
||||
set(ENV{PATH} "$ENV{PATH}:${TOOLS_PATH}/bin")
|
||||
else()
|
||||
set(ENV{PATH} "$ENV{PATH};${PYTHON2_EXE_PATH}")
|
||||
set(ENV{PATH} "$ENV{PATH};${TOOLS_PATH}/bin")
|
||||
endif()
|
||||
|
||||
# Acquire BDE sources
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO "bloomberg/bde"
|
||||
REF 3720d132d0879f19b9084cca62ebc75f1f24e1a3
|
||||
SHA512 234ebb71997f5b7d3951584235ead10f977689cef323ae1c198629a6b1995b1481d8a1515d827c46df10209bdc66e1f3cc7780dafee9ca0ff4172be47c460d78
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
# Clean up previous builds
|
||||
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
|
||||
${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
|
||||
|
||||
# Identify waf executable and calculate configure args
|
||||
if(VCPKG_CMAKE_SYSTEM_NAME)
|
||||
set(WAF_COMMAND waf)
|
||||
else()
|
||||
set(WAF_COMMAND waf.bat)
|
||||
endif()
|
||||
set(CONFIGURE_COMMON_ARGS --use-flat-include-dir)
|
||||
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
||||
set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=32)
|
||||
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
|
||||
set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --abi-bits=64)
|
||||
else()
|
||||
message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
|
||||
endif()
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --library-type=static)
|
||||
else()
|
||||
message(FATAL_ERROR "Unsupported library linkage: ${VCPKG_LIBRARY_LINKAGE}")
|
||||
endif()
|
||||
if(NOT VCPKG_CMAKE_SYSTEM_NAME)
|
||||
if(VCPKG_CRT_LINKAGE STREQUAL static)
|
||||
set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --msvc-runtime-type=static)
|
||||
else()
|
||||
set(CONFIGURE_COMMON_ARGS ${CONFIGURE_COMMON_ARGS} --msvc-runtime-type=dynamic)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Configure debug
|
||||
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
|
||||
vcpkg_execute_required_process(
|
||||
COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS}
|
||||
--prefix=${CURRENT_PACKAGES_DIR}/debug --out=${SOURCE_PATH_DEBUG}
|
||||
--build-type=debug
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
LOGNAME configure-${TARGET_TRIPLET}--dbg
|
||||
)
|
||||
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
|
||||
|
||||
# Build debug
|
||||
message(STATUS "Building ${TARGET_TRIPLET}-dbg")
|
||||
vcpkg_execute_required_process(
|
||||
COMMAND ${WAF_COMMAND} build
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
LOGNAME build-${TARGET_TRIPLET}--dbg
|
||||
)
|
||||
message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
|
||||
|
||||
# Install debug
|
||||
message(STATUS "Installing ${TARGET_TRIPLET}-dbg")
|
||||
vcpkg_execute_required_process(
|
||||
COMMAND ${WAF_COMMAND} install
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
LOGNAME install-${TARGET_TRIPLET}--dbg
|
||||
)
|
||||
# Include files should not be duplicated
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
# pkg-config files should point to correct include directory
|
||||
file(GLOB PC_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc")
|
||||
foreach(PC_FILE_NAME ${PC_FILES})
|
||||
file(READ "${PC_FILE_NAME}" _contents)
|
||||
string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/../include" _contents "${_contents}")
|
||||
file(WRITE "${PC_FILE_NAME}" "${_contents}")
|
||||
endforeach()
|
||||
message(STATUS "Installing ${TARGET_TRIPLET}-dbg done")
|
||||
|
||||
# Configure release
|
||||
message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
|
||||
vcpkg_execute_required_process(
|
||||
COMMAND ${WAF_COMMAND} configure ${CONFIGURE_COMMON_ARGS}
|
||||
--prefix=${CURRENT_PACKAGES_DIR} --out=${SOURCE_PATH_RELEASE}
|
||||
--build-type=release
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
LOGNAME configure-${TARGET_TRIPLET}--rel
|
||||
)
|
||||
message(STATUS "Configuring ${TARGET_TRIPLET}-rel done")
|
||||
|
||||
# Build release
|
||||
message(STATUS "Building ${TARGET_TRIPLET}-rel")
|
||||
vcpkg_execute_required_process(
|
||||
COMMAND ${WAF_COMMAND} build
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
LOGNAME build-${TARGET_TRIPLET}--rel
|
||||
)
|
||||
message(STATUS "Building ${TARGET_TRIPLET}-rel done")
|
||||
|
||||
# Install release
|
||||
message(STATUS "Installing ${TARGET_TRIPLET}-rel")
|
||||
vcpkg_execute_required_process(
|
||||
COMMAND ${WAF_COMMAND} install
|
||||
WORKING_DIRECTORY ${SOURCE_PATH}
|
||||
LOGNAME install-${TARGET_TRIPLET}--rel
|
||||
)
|
||||
message(STATUS "Installing ${TARGET_TRIPLET}-rel done")
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE
|
||||
DESTINATION ${CURRENT_PACKAGES_DIR}/share/bde
|
||||
RENAME copyright
|
||||
)
|
||||
@ -1,3 +1,3 @@
|
||||
Source: benchmark
|
||||
Version: 1.4.0
|
||||
Version: 1.4.1
|
||||
Description: A library to support the benchmarking of functions, similar to unit-tests.
|
||||
|
||||
@ -2,11 +2,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
|
||||
message(FATAL_ERROR "${PORT} does not currently support UWP")
|
||||
endif()
|
||||
|
||||
if(VCPKG_CRT_LINKAGE STREQUAL static)
|
||||
message(FATAL_ERROR "Google benchmark only supports dynamic crt linkage.")
|
||||
endif()
|
||||
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
||||
if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
|
||||
message(STATUS "Warning: Dynamic building not supported yet. Building static.")
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
endif()
|
||||
@ -16,8 +12,8 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO google/benchmark
|
||||
REF v1.4.0
|
||||
SHA512 4bb5119fe6c0558e5a8b39486169ffcbf24e877ec7f28636dfab1692936b77334f76d28bda2cdada18e5070579da7a5bf0617bfbb6a09848f0b071df8e694d76
|
||||
REF v1.4.1
|
||||
SHA512 e9d71b4679cb4e4d755f7bb4101e131b37e209b6aebd0853e0c63eb11c42b75faa5da4ff8c265149808a475f3a1cfb140c5b49f877acfda908a4bb7add983aae
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
|
||||
@ -9,16 +9,18 @@ add_definitions(
|
||||
-D_CRT_SECURE_NO_DEPRECATE
|
||||
-D_CRT_NONSTDC_NO_DEPRECATE
|
||||
-D_LIB
|
||||
-DUNICODE
|
||||
-D_UNICODE
|
||||
)
|
||||
|
||||
if (BUILD_SHARED_LIBS)
|
||||
add_definitions(
|
||||
-D_LIB
|
||||
-DDB_CREATE_DLL
|
||||
-D_USRDLL
|
||||
)
|
||||
else()
|
||||
add_definitions(
|
||||
-DDB_CREATE_DLL
|
||||
-D_USRDLL
|
||||
-D_LIB
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
Source: berkeleydb
|
||||
Version: 4.8.30
|
||||
Version: 4.8.30-2
|
||||
Description: A high-performance embedded database for key/value data.
|
||||
|
||||
4
ports/bitserializer-cpprestjson/CONTROL
Normal file
4
ports/bitserializer-cpprestjson/CONTROL
Normal file
@ -0,0 +1,4 @@
|
||||
Source: bitserializer-cpprestjson
|
||||
Version: 0.8
|
||||
Build-Depends: bitserializer, cpprestsdk
|
||||
Description: This is an implementation of the BitSerializer archive for serialization JSON (based on CppRestSDK library).
|
||||
13
ports/bitserializer-cpprestjson/portfile.cmake
Normal file
13
ports/bitserializer-cpprestjson/portfile.cmake
Normal file
@ -0,0 +1,13 @@
|
||||
include(vcpkg_common_functions)
|
||||
vcpkg_from_bitbucket(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Pavel_Kisliak/BitSerializer
|
||||
REF 0.8
|
||||
SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/archives/bitserializer_cpprest_json DESTINATION ${CURRENT_PACKAGES_DIR}/include)
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-cpprestjson RENAME copyright)
|
||||
4
ports/bitserializer-rapidjson/CONTROL
Normal file
4
ports/bitserializer-rapidjson/CONTROL
Normal file
@ -0,0 +1,4 @@
|
||||
Source: bitserializer-rapidjson
|
||||
Version: 0.8
|
||||
Build-Depends: bitserializer, rapidjson
|
||||
Description: This is an implementation of the BitSerializer archive for serialization JSON (based on the RapidJson library).
|
||||
13
ports/bitserializer-rapidjson/portfile.cmake
Normal file
13
ports/bitserializer-rapidjson/portfile.cmake
Normal file
@ -0,0 +1,13 @@
|
||||
include(vcpkg_common_functions)
|
||||
vcpkg_from_bitbucket(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Pavel_Kisliak/BitSerializer
|
||||
REF 0.8
|
||||
SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/archives/bitserializer_rapidjson DESTINATION ${CURRENT_PACKAGES_DIR}/include)
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer-rapidjson RENAME copyright)
|
||||
@ -1,4 +1,3 @@
|
||||
Source: bitserializer
|
||||
Version: 0.7
|
||||
Build-Depends: cpprestsdk
|
||||
Description: The library for simple serialization of arbitrary C++ types to various output formats (currently just supported JSON based on CppRestSDK).
|
||||
Version: 0.8
|
||||
Description: The core part of library for serialization of arbitrary C++ types to various output formats.
|
||||
|
||||
@ -2,12 +2,12 @@ include(vcpkg_common_functions)
|
||||
vcpkg_from_bitbucket(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO Pavel_Kisliak/BitSerializer
|
||||
REF 0.7
|
||||
SHA512 3a50b1b3077115f60d298f4257ae6a5a350c1d8b3d575af83b4f0746757ab3393da7c81ac9c7db4e30540fe94f1742b1d39de724b2dec080faf727b885bb19a4
|
||||
REF 0.8
|
||||
SHA512 6df5b3f7a472a55ba0aace22c44cb2adaf178fbc7f920dcaf7d7015f81badde98d64911ddb620e99a708214140d7c29561775c1b0fe60fef6f24d465a4eac093
|
||||
HEAD_REF master
|
||||
)
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
|
||||
file(INSTALL ${SOURCE_PATH}/core/bitserializer DESTINATION ${CURRENT_PACKAGES_DIR}/include)
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/bitserializer RENAME copyright)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Source: blaze
|
||||
Version: 3.3
|
||||
Version: 3.4-1
|
||||
Build-Depends: clapack, boost-exception
|
||||
Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.
|
||||
|
||||
113
ports/blaze/avoid-src-dir-generation.patch
Normal file
113
ports/blaze/avoid-src-dir-generation.patch
Normal file
@ -0,0 +1,113 @@
|
||||
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)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user