Merge branch 'master' into external_file_abi

This commit is contained in:
Curtis J Bezault 2019-08-09 11:59:32 -04:00 committed by GitHub
commit c4f1a91ef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
396 changed files with 4995 additions and 2170 deletions

2
.gitignore vendored
View File

@ -11,7 +11,7 @@
*.userosscache
*.sln.docstates
toolsrc/out
toolsrc/out*
toolsrc/CMakeSettings.json
# User-specific files (MonoDevelop/Xamarin Studio)

View File

@ -1,3 +1,625 @@
vcpkg (2019.7.31)
---
#### Total port count: 1105
#### Total port count per triplet (tested):
|triplet|ports available|
|---|---|
|**x64-windows**|1039|
|x86-windows|1009|
|x64-windows-static|928|
|**x64-linux**|866|
|**x64-osx**|788|
|arm64-windows|678|
|x64-uwp|546|
|arm-uwp|522|
#### The following commands and options have been updated:
- --scripts-root ***[NEW OPTION]***
- Specify a directory to use in place of `<vcpkg root>/scripts`. Enables a shared script directory for those using a single vcpkg instance to manage distributed port directories
- [(#6552)](https://github.com/microsoft/vcpkg/pull/6552) Allow redirection of the scripts folder.
- depend-info
- Allow `vcpkg depend-info port[feature]` to display port-dependency information for a given port and the specified feature.
- [(#6797)](https://github.com/microsoft/vcpkg/pull/6797) Make `depend-info` subcommand able to handle features
#### The following documentation has been updated:
- [Overlay triplets example: build dynamic libraries on Linux](docs/examples/overlay-triplets-linux-dynamic.md) ***[NEW]***
- [(#7291)](https://github.com/microsoft/vcpkg/pull/7291) Example: Building dynamic libraries on Linux using overlay triplets
- [vcpkg_from_git](docs/maintainers/vcpkg_from_git.md)
- [(#7082)](https://github.com/microsoft/vcpkg/pull/7082) Fix vcpkg_from_git
- [Maintainer Guidelines and Policies](docs/maintainers/maintainer-guide.md)
- [(#7390)](https://github.com/microsoft/vcpkg/pull/7390) [docs] add notes about manual-link
#### The following *remarkable* changes have been made to vcpkg's infrastructure:
- `VCPKG_ENV_PASSTHROUGH` triplet variable and `environment-overrides.cmake`
- Port authors can add an `environment-overrides.cmake` file to a port to override triplet settings globally or to define behavior of the vpckg binary on a per port basis
- [(#7290)](https://github.com/microsoft/vcpkg/pull/7290) [vcpkg] Environment Variable Passthrough
- [(#7292)](https://github.com/microsoft/vcpkg/pull/7292) [vcpkg] Portfile Settings
- Testing overhaul
- Tests have been migrated from the Visual Studio unit testing framework to the cross-platform [Catch2](https://github.com/catchorg/Catch2)
- [(#7315)](https://github.com/microsoft/vcpkg/pull/7315) Rewrite the tests! now they're cross-platform!
#### The following *additional* changes have been made to vcpkg's infrastructure:
- [(#7080)](https://github.com/microsoft/vcpkg/pull/7080) [vcpkg] Use spaces instead of semicolons in the output
- [(#6791)](https://github.com/microsoft/vcpkg/pull/6791) Update python2, python3, perl, aria2, ninja, ruby, 7z
- [(#7082)](https://github.com/microsoft/vcpkg/pull/7082) Fix vcpkg_from_git
- [(#7117)](https://github.com/microsoft/vcpkg/pull/7117) Revert Visual Studio projects versions
- [(#7051)](https://github.com/microsoft/vcpkg/pull/7051) Fix Python3 tool on Windows
- [(#7135)](https://github.com/microsoft/vcpkg/pull/7135) revert ninja update
- [(#7136)](https://github.com/microsoft/vcpkg/pull/7136) Bump version to warn of outdated vcpkg sources
- [(#7094)](https://github.com/microsoft/vcpkg/pull/7094) [vcpkg] Fix powershell font corruption bug
- [(#7158)](https://github.com/microsoft/vcpkg/pull/7158) [vcpkg] Fix incorrect setting of FEATURE_OPTIONS
- [(#6792)](https://github.com/microsoft/vcpkg/pull/6792) Cleanup vcpkg_configure_cmake.cmake
- [(#7175)](https://github.com/microsoft/vcpkg/pull/7175) Added nasm mirror as nasm.us is down again
- [(#7216)](https://github.com/microsoft/vcpkg/pull/7216) [vcpkg] allow spaces in pathname on linux
- [(#7243)](https://github.com/microsoft/vcpkg/pull/7243) Testing for --overlay-ports and --overlay-triplets args
- [(#7294)](https://github.com/microsoft/vcpkg/pull/7294) Add June changelog
- [(#7229)](https://github.com/microsoft/vcpkg/pull/7229) Better error message when VCPKG_ROOT is independently defined
- [(#7336)](https://github.com/microsoft/vcpkg/pull/7336) Create issue templates
- [(#7322)](https://github.com/microsoft/vcpkg/pull/7322) Resolves "project is never up-to-date" problem (issue 6179)
- [(#7228)](https://github.com/microsoft/vcpkg/pull/7228) Parallel file operations
- [(#7403)](https://github.com/microsoft/vcpkg/pull/7403) Add third party notices -- copied from chakracore
- [(#7407)](https://github.com/microsoft/vcpkg/pull/7407) Modify CMakeLists to split up vcpkglib
- [(#7430)](https://github.com/microsoft/vcpkg/pull/7430) [vcpkg] Fix RealFilesystem::remove_all
<details>
<summary><b>The following 37 ports have been added:</b></summary>
|port|version|
|---|---|
|[septag-sx](https://github.com/microsoft/vcpkg/pull/6327)| 2019-05-07-1
|[librdkafka](https://github.com/microsoft/vcpkg/pull/5921)| 1.1.0
|[soxr](https://github.com/microsoft/vcpkg/pull/6478)| 0.1.3.
|[czmq](https://github.com/microsoft/vcpkg/pull/4979)<sup>[#7186](https://github.com/microsoft/vcpkg/pull/7186) </sup>| 2019-06-10-1
|[cppmicroservices](https://github.com/microsoft/vcpkg/pull/6388)| 4.0.0-pre1
|[zookeeper](https://github.com/microsoft/vcpkg/pull/7000)| 3.5.5
|[xmlsec](https://github.com/microsoft/vcpkg/pull/7196)| 1.2.28
|[librsvg](https://github.com/microsoft/vcpkg/pull/6807)| 2.40.20
|[7zip](https://github.com/microsoft/vcpkg/pull/6920)| 19.00
|[genann](https://github.com/microsoft/vcpkg/pull/7195)| 2019-07-10
|[offscale-libetcd-cpp](https://github.com/microsoft/vcpkg/pull/6999)| 2019-07-10
|[rabit](https://github.com/microsoft/vcpkg/pull/7234)| 0.1
|[zyre](https://github.com/microsoft/vcpkg/pull/7189)| 2019-07-07
|[cpp-peglib](https://github.com/microsoft/vcpkg/pull/7254)| 0.1.0
|[paho-mqttpp3](https://github.com/microsoft/vcpkg/pull/7033)| 1.0.1
|[openxr-loader](https://github.com/microsoft/vcpkg/pull/6339)<sup>[#7376](https://github.com/microsoft/vcpkg/pull/7376) [#7488](https://github.com/microsoft/vcpkg/pull/7488) </sup>| 1.0.0-1
|[wintoast](https://github.com/microsoft/vcpkg/pull/7006)| 1.2.0
|[scnlib](https://github.com/microsoft/vcpkg/pull/7014)| 0.1.2
|[mongoose](https://github.com/microsoft/vcpkg/pull/7089)| 6.15-1
|[nameof](https://github.com/microsoft/vcpkg/pull/7250)| 2019-07-13
|[leaf](https://github.com/microsoft/vcpkg/pull/7319)<sup>[#7468](https://github.com/microsoft/vcpkg/pull/7468) </sup>| 0.2.1-2
|[otl](https://github.com/microsoft/vcpkg/pull/7272)| 4.0.442
|[dbg-macro](https://github.com/microsoft/vcpkg/pull/7237)| 2019-07-11
|[p-ranav-csv](https://github.com/microsoft/vcpkg/pull/7236)| 2019-07-11
|[lastools](https://github.com/microsoft/vcpkg/pull/7220)| 2019-07-10
|[basisu](https://github.com/microsoft/vcpkg/pull/6995)<sup>[#7468](https://github.com/microsoft/vcpkg/pull/7468) </sup>| 0.0.1-1
|[cmcstl2](https://github.com/microsoft/vcpkg/pull/7348)| 2019-07-20
|[libconfuse](https://github.com/microsoft/vcpkg/pull/7252)| 2019-07-14
|[boolinq](https://github.com/microsoft/vcpkg/pull/7362)| 2019-07-22
|[libzippp](https://github.com/microsoft/vcpkg/pull/6801)| 2019-07-22
|[mimalloc](https://github.com/microsoft/vcpkg/pull/7011)| 2019-06-25
|[liblas](https://github.com/microsoft/vcpkg/pull/6746)| 1.8.1
|[xtensor-io](https://github.com/microsoft/vcpkg/pull/7398)| 0.7.0
|[easycl](https://github.com/microsoft/vcpkg/pull/7387)| 0.3
|[nngpp](https://github.com/microsoft/vcpkg/pull/7417)| 2019-07-25
|[mpi](https://github.com/microsoft/vcpkg/pull/7142)| 1
|[openmpi](https://github.com/microsoft/vcpkg/pull/7142)| 4.0.1
</details>
<details>
<summary><b>The following 160 ports have been updated:</b></summary>
- openssl-unix `1.0.2q` -> `1.0.2s-1`
- [(#6854)](https://github.com/microsoft/vcpkg/pull/6854) Openssl version bump 1.0.2s
- [(#6512)](https://github.com/microsoft/vcpkg/pull/6512) [openssl-unix] Shared library support
- openssl-windows `1.0.2q-2` -> `1.0.2s-1`
- [(#6854)](https://github.com/microsoft/vcpkg/pull/6854) Openssl version bump 1.0.2s
- mongo-cxx-driver `3.4.0-2` -> `3.4.0-3`
- [(#7050)](https://github.com/microsoft/vcpkg/pull/7050) [mongo-cxx-driver] Do not delete the third_party include folder when building with mnmlstc
- fdlibm `5.3-3` -> `5.3-4`
- [(#7082)](https://github.com/microsoft/vcpkg/pull/7082) Fix vcpkg_from_git
- azure-iot-sdk-c `2019-05-16.1` -> `2019-07-01.1`
- [(#7123)](https://github.com/microsoft/vcpkg/pull/7123) [azure] Update azure-iot-sdk-c for public-preview release of 2019-07-01
- open62541 `0.3.0-1` -> `0.3.0-2`
- [(#7051)](https://github.com/microsoft/vcpkg/pull/7051) Fix Python3 tool on Windows
- lua `5.3.5-1` -> `5.3.5-2`
- [(#7101)](https://github.com/microsoft/vcpkg/pull/7101) [lua] Add [cpp] feature to additionally build lua-c++
- flann `1.9.1-1` -> `2019-04-07-1`
- [(#7125)](https://github.com/microsoft/vcpkg/pull/7125) [flann]Change the version tag to the corresponding time of commit id.
- tbb `2019_U7` -> `2019_U7-1`
- [(#6510)](https://github.com/microsoft/vcpkg/pull/6510) [tbb] Add shared library support for Linux and OSX
- dcmtk `3.6.4` -> `3.6.4-1`
- [(#7059)](https://github.com/microsoft/vcpkg/pull/7059) [dcmtk] support wchar_t* filename
- libmupdf `1.15.0` -> `1.15.0-1`
- [(#7107)](https://github.com/microsoft/vcpkg/pull/7107) [libmupdf] Enable the old patch for fixing C2169
- mongo-c-driver `1.14.0-2` -> `1.14.0-3`
- [(#7048)](https://github.com/microsoft/vcpkg/pull/7048) [mongo-c-driver] Add usage
- [(#7338)](https://github.com/microsoft/vcpkg/pull/7338) [mongo-c-driver] Disable snappy auto-detection
- openimageio `1.8.16` -> `2.0.8`
- [(#7173)](https://github.com/microsoft/vcpkg/pull/7173) [openimageio] Upgrade to version 2.0.8
- duktape `2.3.0` -> `2.3.0-2`
- [(#7170)](https://github.com/microsoft/vcpkg/pull/7170) [duktape] Fix package not found by find_package.
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- poco `2.0.0-pre-2` -> `2.0.0-pre-3`
- [(#7169)](https://github.com/microsoft/vcpkg/pull/7169) [Poco] Add missing ipjlpapi.lib to foundation library
- gsoap `2.8.84-1` -> `2.8.87-1`
- [(#7145)](https://github.com/microsoft/vcpkg/pull/7145) [gsoap] Update to 2.8.87
- qt5-mqtt `5.12.3` -> `5.12.3-1`
- [(#7130)](https://github.com/microsoft/vcpkg/pull/7130) [qt5-mqtt] crossplatform add to path
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- botan `2.9.0-1` -> `2.9.0-2`
- [(#7140)](https://github.com/microsoft/vcpkg/pull/7140) [botan] Fix build error C2039 with Visual Studio 2019 and C++17
- [(#7303)](https://github.com/microsoft/vcpkg/pull/7303) [botan] Fix parallel build
- kinectsdk2 `2.0` -> `2.0-1`
- [(#7143)](https://github.com/microsoft/vcpkg/pull/7143) kinectsdk2: fix missing header files
- civetweb `1.11-1` -> `2019-07-05`
- [(#7166)](https://github.com/microsoft/vcpkg/pull/7166) [civetweb] Upgrade and enable feature websocket
- curl `7.65.0-2` -> `7.65.2-1`
- [(#7156)](https://github.com/microsoft/vcpkg/pull/7156) [curl] Add features.
- [(#7093)](https://github.com/microsoft/vcpkg/pull/7093) [curl] Update to 7.65.2
- aws-checksums `0.1.2` -> `0.1.3`
- [(#7154)](https://github.com/microsoft/vcpkg/pull/7154) [aws-checksums]Upgrade version to 0.1.3
- rapidjson `1.1.0-3` -> `d87b698-1`
- [(#7152)](https://github.com/microsoft/vcpkg/pull/7152) [rapidjson] Update to the latest commit and also fix #3401.
- [(#7273)](https://github.com/microsoft/vcpkg/pull/7273) [rapidjson] Fix path RapidJSON_INCLUDE_DIRS
- freetype `2.10.0` -> `2.10.1-1`
- [(#7141)](https://github.com/microsoft/vcpkg/pull/7141) [freetype]Re-fixed the issue of exporting symbols when building dynamic library.
- [(#7341)](https://github.com/microsoft/vcpkg/pull/7341) [freetype] Update to 2.10.1
- llvm `7.0.0-3` -> `8.0.0`
- [(#7209)](https://github.com/microsoft/vcpkg/pull/7209) [llvm] Update to 8.0.0
- reproc `6.0.0-1` -> `6.0.0-2`
- [(#7208)](https://github.com/microsoft/vcpkg/pull/7208) [reproc] Fix reproc++ installation path
- wil `2019-06-10` -> `2019-07-16`
- [(#7215)](https://github.com/microsoft/vcpkg/pull/7215) [wil] Update
- [(#7285)](https://github.com/microsoft/vcpkg/pull/7285) Update wil port to match the commit used for NuGet package 1.0.190716.2
- tesseract `4.0.0-3` -> `4.1.0-1`
- [(#7144)](https://github.com/microsoft/vcpkg/pull/7144) [tesseract] Fix Port. Making it crossplatform
- [(#7227)](https://github.com/microsoft/vcpkg/pull/7227) [tesseract] port update to 4.1.0 release
- [(#7360)](https://github.com/microsoft/vcpkg/pull/7360) [tesseract[training_tools]] Fix build error
- zeromq `2019-05-07` -> `2019-07-09`
- [(#7203)](https://github.com/microsoft/vcpkg/pull/7203) [zeromq] Update to 4.3.2
- spirv-tools `2019.3-dev` -> `2019.3-dev-1`
- [(#7204)](https://github.com/microsoft/vcpkg/pull/7204) [spirv-tools] Fix removed patch
- libraqm `0.6.0` -> `0.7.0`
- [(#7149)](https://github.com/microsoft/vcpkg/pull/7149) [libraqm] Update libraqm to 0.7.0
- [(#7263)](https://github.com/microsoft/vcpkg/pull/7263) [libraqm] Fix copying raqm-version.h to include directory
- pthreads `3.0.0-1` -> `3.0.0-2`
- [(#7178)](https://github.com/microsoft/vcpkg/pull/7178) [pthreads4W] vcpkg wrapper fixes
- libkml `1.3.0-2` -> `1.3.0-3`
- [(#7194)](https://github.com/microsoft/vcpkg/pull/7194) [libkml] Fix install path
- [(#7282)](https://github.com/microsoft/vcpkg/pull/7282) [minizip] Make BZip2 an optional feature
- gherkin-c `4.1.2` -> `2019-10-07-1`
- [(#7231)](https://github.com/microsoft/vcpkg/pull/7231) [gherkin-b] update to latest
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- google-cloud-cpp `0.10.0` -> `0.11.0`
- [(#7134)](https://github.com/microsoft/vcpkg/pull/7134) Upgrade google-cloud-cpp to v0.11.0.
- sqlite3 `3.28.0-1` -> `3.29.0-1`
- [(#7202)](https://github.com/microsoft/vcpkg/pull/7202) [sqlite3-tool]Fix build error on arm/uwp platform.
- [(#7342)](https://github.com/microsoft/vcpkg/pull/7342) [sqlite3] Update to 3.29.0
- nonius `2019-04-20` -> `2019-04-20-1`
- [(#7258)](https://github.com/microsoft/vcpkg/pull/7258) [nonius] properly install noniusConfig.cmake
- leveldb `1.22` -> `1.22-1`
- [(#7245)](https://github.com/microsoft/vcpkg/pull/7245) [leveldb] Fix cmake config
- bond `8.1.0` -> `8.1.0-2`
- [(#7273)](https://github.com/microsoft/vcpkg/pull/7273) [rapidjson] Fix path RapidJSON_INCLUDE_DIRS
- [(#7306)](https://github.com/microsoft/vcpkg/pull/7306) [bond] make haskell an external dependency
- [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
- cpprestsdk `2.10.13-1` -> `2.10.14`
- [(#7286)](https://github.com/microsoft/vcpkg/pull/7286) Update cpprestsdk to v2.10.14.
- qt5-base `5.12.3-1` -> `5.12.3-3`
- [(#6983)](https://github.com/microsoft/vcpkg/pull/6983) [qt5-base]Add a print message to inform the user to install the dependency package.
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-3d `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-activeqt `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-charts `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-connectivity `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-datavis3d `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-declarative `5.12.3-1` -> `5.12.3-2`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-gamepad `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-graphicaleffects `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-imageformats `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-location `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-macextras `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-modularscripts `2019-04-30` -> `2019-04-30-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-multimedia `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-networkauth `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-purchasing `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-quickcontrols `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-quickcontrols2 `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-remoteobjects `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-script `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-scxml `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-sensors `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-serialport `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-speech `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-svg `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-tools `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-virtualkeyboard `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-webchannel `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-websockets `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-webview `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- qt5-winextras `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- [(#7298)](https://github.com/microsoft/vcpkg/pull/7298) [qt5-winextras, ecsutil, soundtouch] Fix build-depends
- qt5-xmlpatterns `5.12.3` -> `5.12.3-1`
- [(#7230)](https://github.com/microsoft/vcpkg/pull/7230) [qt5]Fix build failure in linux
- rocksdb `6.0.2` -> `6.1.2`
- [(#7304)](https://github.com/microsoft/vcpkg/pull/7304) [rocksdb] Update rocksdb to 6.1.2, adds optional zstd feature
- metis `5.1.0-3` -> `5.1.0-5`
- [(#7299)](https://github.com/microsoft/vcpkg/pull/7299) [metis] Fix linux build error.
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- ecsutil `1.0.6.1` -> `1.0.7.2`
- [(#7298)](https://github.com/microsoft/vcpkg/pull/7298) [qt5-winextras, ecsutil, soundtouch] Fix build-depends
- [(#7427)](https://github.com/microsoft/vcpkg/pull/7427) [ECSUtil] update library to v1.0.7.2
- soundtouch `2.0.0-2` -> `2.0.0-3`
- [(#7298)](https://github.com/microsoft/vcpkg/pull/7298) [qt5-winextras, ecsutil, soundtouch] Fix build-depends
- libsodium `1.0.18` -> `1.0.18-1`
- [(#7297)](https://github.com/microsoft/vcpkg/pull/7297) [libsodium] Fix Linux build error.
- irrlicht `1.8.4` -> `1.8.4-2`
- [(#7296)](https://github.com/microsoft/vcpkg/pull/7296) [irrlicht] add vcpkg-cmake-wrapper
- [(#7354)](https://github.com/microsoft/vcpkg/pull/7354) [irrlicht] use unicode path on windows
- libyaml `0.2.2` -> `0.2.2-1`
- [(#7277)](https://github.com/microsoft/vcpkg/pull/7277) [libyaml] Fix build error
- eastl `3.13.05-1` -> `3.14.00`
- [(#7276)](https://github.com/microsoft/vcpkg/pull/7276) [eastl] Upgrade to 3.14
- boost-asio `1.70.0-1` -> `1.70.0-2`
- [(#7267)](https://github.com/microsoft/vcpkg/pull/7267) Fixed boost-asio on Windows
- minizip `1.2.11-4` -> `1.2.11-5`
- [(#7282)](https://github.com/microsoft/vcpkg/pull/7282) [minizip] Make BZip2 an optional feature
- blend2d `beta_2019-04-30` -> `beta_2019-07-16`
- [(#7239)](https://github.com/microsoft/vcpkg/pull/7239) [blend2d] Port update
- so5extra `1.2.3-1` -> `1.3.1`
- [(#7238)](https://github.com/microsoft/vcpkg/pull/7238) [sobjectizer, so5extra] updates
- sobjectizer `5.5.24.4-1` -> `5.6.0.2`
- [(#7238)](https://github.com/microsoft/vcpkg/pull/7238) [sobjectizer, so5extra] updates
- directxtk `apr2019` -> `apr2019-1`
- [(#7233)](https://github.com/microsoft/vcpkg/pull/7233) [DirectXTK] Fix UWP build error
- restbed `4.16-07-28-2018` -> `4.16-07-28-2018-1`
- [(#7232)](https://github.com/microsoft/vcpkg/pull/7232) [restbed] Add openssl feature
- clapack `3.2.1-9` -> `3.2.1-10`
- [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working.
- geogram `1.6.9-6` -> `1.6.9-7`
- [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working.
- mlpack `3.1.1` -> `3.1.1-1`
- [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working.
- openblas `0.3.6-4` -> `0.3.6-5`
- [(#6786)](https://github.com/microsoft/vcpkg/pull/6786) [openblas/clapack] FindLapack/FindBLAS was not working.
- pprint `2019-06-01` -> `2019-07-19`
- [(#7317)](https://github.com/microsoft/vcpkg/pull/7317) [pprint] Fix #7301
- boost-type-erasure `1.70.0` -> `1.70.0-1`
- [(#7325)](https://github.com/microsoft/vcpkg/pull/7325) [boost-type-erasure] fix depends on arm
- armadillo `2019-04-16-3` -> `2019-04-16-4`
- [(#7041)](https://github.com/microsoft/vcpkg/pull/7041) [armadillo] Fix installation path
- cutelyst2 `2.7.0` -> `2.8.0`
- [(#7327)](https://github.com/microsoft/vcpkg/pull/7327) [cutelyst2]Upgrade version to 2.8.0
- sdl2-image `2.0.4-3` -> `2.0.5`
- [(#7355)](https://github.com/microsoft/vcpkg/pull/7355) [sdl2-image] Updated to 2.0.5
- qhull `7.2.1-3` -> `7.3.2`
- [(#7340)](https://github.com/microsoft/vcpkg/pull/7340) [qhull] Update to 7.3.2 and fix postbuild validation
- libexif `0.6.21-1` -> `0.6.21-2`
- [(#7344)](https://github.com/microsoft/vcpkg/pull/7344) [Libexif] update download location
- arrow `0.13.0-4` -> `0.14.1`
- [(#7211)](https://github.com/microsoft/vcpkg/pull/7211) [Arrow] Update to Arrow v0.14.1
- date `ed0368f` -> `2019-05-18-1`
- [(#7399)](https://github.com/microsoft/vcpkg/pull/7399) [date] Fix issue with feature remote-api
- libmariadb `3.0.10-1` -> `3.0.10-3`
- [(#7396)](https://github.com/microsoft/vcpkg/pull/7396) [libmariadb] Fix build library type and install path
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- inja `2.1.0` -> `2.1.0-1`
- [(#7402)](https://github.com/microsoft/vcpkg/pull/7402) [inja] Use inja CMakeLists.txt
- pcl `1.9.1-4` -> `1.9.1-5`
- [(#7388)](https://github.com/microsoft/vcpkg/pull/7388) [pcl] Fix cuda building compatability issues with cuda 10.1
- thrift `2019-05-07-2` -> `2019-05-07-3`
- [(#7302)](https://github.com/microsoft/vcpkg/pull/7302) [Thrift] Make Thrift static again
- forest `12.0.0` -> `12.0.3`
- [(#7410)](https://github.com/microsoft/vcpkg/pull/7410) [forest] Update to Version 12.0.3
- nlohmann-json `3.6.1` -> `3.7.0`
- [(#7459)](https://github.com/microsoft/vcpkg/pull/7459) [nlohmann-json] Update to 3.7.0
- ecm `5.58.0` -> `5.60.0-1`
- [(#7457)](https://github.com/microsoft/vcpkg/pull/7457) [ecm] Update library to v5.60.0
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- gl2ps `1.4.0-1` -> `1.4.0-3`
- [(#7453)](https://github.com/microsoft/vcpkg/pull/7453) [gl2ps]Update to use vcpkg new functions(vcpkg_from_gitlab).
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- darknet `0.2.5-4` -> `0.2.5-5`
- [(#7450)](https://github.com/microsoft/vcpkg/pull/7450) [darknet] add training feature
- g3log `2019-05-14-1` -> `2019-07-29`
- [(#7448)](https://github.com/microsoft/vcpkg/pull/7448) [g3log] Fix https://github.com/KjellKod/g3log/issues/319
- azure-storage-cpp `6.1.0` -> `6.1.0-2`
- [(#7404)](https://github.com/microsoft/vcpkg/pull/7404) [azure-storage-cpp] Removed gcov dependency in debug Linux build (#7311)
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- ace `6.5.5-1` -> `6.5.6`
- [(#7466)](https://github.com/microsoft/vcpkg/pull/7466) [ace] ace 6.5.6
- bullet3 `2.88` -> `2.88-1`
- [(#7474)](https://github.com/microsoft/vcpkg/pull/7474) [Bullet3] feature for multithreading
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- alembic `1.7.11-2` -> `1.7.11-3`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- ampl-mp `2019-03-21` -> `2019-03-21-1`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- anax `2.1.0-5` -> `2.1.0-6`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- apr `1.6.5-1` -> `1.6.5-2`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- blosc `1.16.3-1` -> `1.16.3-2`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- capnproto `0.7.0-2` -> `0.7.0-3`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- cgicc `3.2.19-1` -> `3.2.19-2`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- charls `2.0.0-1` -> `2.0.0-2`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- collada-dom `2.5.0-1` -> `2.5.0-2`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- ctemplate `2017-06-23-44b7c5-3` -> `2017-06-23-44b7c5-4`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- dlfcn-win32 `1.1.1-1` -> `1.1.1-2`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- easyloggingpp `9.96.7` -> `9.96.7-1`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- fastfeat `391d5e9` -> `391d5e9-1`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- fastlz `1.0-2` -> `1.0-3`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- freeglut `3.0.0-6` -> `3.0.0-7`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- glbinding `3.1.0-1` -> `3.1.0-2`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- glew `2.1.0-4` -> `2.1.0-5`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- glfw3 `3.3` -> `3.3-1`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- graphicsmagick `1.3.32` -> `1.3.32-1`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- hypre `2.11.2-1` -> `2.11.2-2`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
- jack2 `1.9.12-1` -> `1.9.12-2`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- jxrlib `1.1-7` -> `1.1-8`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- kangaru `4.1.3-1` -> `4.1.3-2`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libconfig `1.7.2` -> `1.7.2-1`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libfreenect2 `0.2.0-2` -> `0.2.0-3`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libmad `0.15.1-2` -> `0.15.1-3`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libmspack `0.10.1` -> `0.10.1-1`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libnice `0.1.15` -> `0.1.15-1`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libodb-boost `2.4.0-2` -> `2.4.0-3`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libodb-mysql `2.4.0-2` -> `2.4.0-3`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libodb-pgsql `2.4.0-2` -> `2.4.0-3`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libodb-sqlite `2.4.0-3` -> `2.4.0-4`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libodb `2.4.0-4` -> `2.4.0-5`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- librabbitmq `0.9.0` -> `0.9.0-1`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libsamplerate `0.1.9.0` -> `0.1.9.0-1`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- libwebsockets `3.1.0-2` -> `3.1.0-3`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- lmdb `0.9.23-1` -> `0.9.23-2`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- mozjpeg `3.2-2` -> `3.2-3`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- nanodbc `2.12.4-3` -> `2.12.4-4`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- nmslib `1.7.3.6` -> `1.7.3.6-1`
- [(#7468)](https://github.com/microsoft/vcpkg/pull/7468) Add PREFER_NINJA to many ports
- amqpcpp `4.1.4` -> `4.1.5`
- [(#7475)](https://github.com/microsoft/vcpkg/pull/7475) [amqpcpp] Update library to v4.1.5
- cxxopts `2.1.2-1` -> `2.2.0`
- [(#7473)](https://github.com/microsoft/vcpkg/pull/7473) [cxxopts] Bumped to v2.2.0
- boost-mpi `1.70.0-1` -> `1.70.0-2`
- [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
- hdf5 `1.10.5-7` -> `1.10.5-8`
- [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
- kealib `1.4.11` -> `1.4.11-1`
- [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
- parmetis `4.0.3-2` -> `4.0.3-3`
- [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
- vtk `8.2.0-4` -> `8.2.0-5`
- [(#7142)](https://github.com/microsoft/vcpkg/pull/7142) [OpenMPI] add a new port
</details>
-- vcpkg team vcpkg@microsoft.com THU, 01 Aug 07:00:00 -0800
vcpkg (2019.6.30)
---
#### Total port count: 1068
@ -7,8 +629,8 @@ vcpkg (2019.6.30)
|**x64-windows**|1006|
|x86-windows|977|
|x64-windows-static|895|
|**x64-osx**|823|
|**x64-linux**|755|
|**x64-osx**|755|
|**x64-linux**|823|
|arm64-windows|654|
|x64-uwp|532|
|arm-uwp|504|

View File

@ -1,66 +1,41 @@
# Overlay triplets example: build dynamic libraries on Linux
# Overlay triplets example
Using **vcpkg** you can build libraries for the following triplets:
## Building dynamic libraries on Linux
<div>
<ul style="columns: 3;">
<li> arm-uwp</li>
<li> arm-windows</li>
<li> arm64-uwp</li>
<li> arm64-windows</li>
<li> x86-uwp</li>
<li> x86-windows</li>
<li> x86-windows-static</li>
<li> x64-uwp</li>
<li> x64-linux</li>
<li> x64-osx</li>
<li> x64-windows</li>
<li> x64-windows-static</li>
</ul>
</div>
Using **vcpkg** you can build libraries for many configurations out of the box. However, this doesn't currently include shared libraries on Linux and Mac OS.
This doesn't mean that you cannot use **vcpkg** to build your dynamic libraries on these platforms! This document will guide you through creating your own custom triplets with `--overlay-triplets` to easily build dynamic libraries on Linux.
By design **vcpkg** builds only static libraries for Linux and Mac OS.
However, this doesn't mean that you cannot use **vcpkg** to build your dynamic libraries on these platforms.
This document will guide you through creating your own custom triplets to build dynamic libraries on Linux using **vcpkg**.
### Step 1: Create a folder to contain your custom triplets
```
~/vcpkg$ mkdir ../custom-triplets
```
### Step 2: Create the custom triplet files
### Step 1: Create the custom triplet files
To save time, copy the existing `x64-linux.cmake` triplet file.
```
~/vcpkg$ cp ./triplets/x64-linux.cmake ../custom-triplets/x64-linux-dynamic.cmake
```sh
~/git$ mkdir custom-triplets
~/git$ cp vcpkg/triplets/x64-linux.cmake custom-triplets/x64-linux-dynamic.cmake
```
And modify `custom-triplets/x64-linux-dynamic.cmake` to match the contents below:
```
```cmake
# ~/git/custom-triplets/x64-linux-dynamic.cmake
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
# Change VCPKG_LIBRARY_LINKAGE from static to dynamic
set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic) # This changed from static to dynamic
set(VCPKG_CMAKE_SYSTEM_NAME Linux)
```
### Step 3: Use `--overlay-triplets` to build dynamic libraries
### Step 2: Use `--overlay-triplets` to build dynamic libraries
Use the `--overlay-triplets` option to include the triplets in the `custom-triplets` directory.
```
./vcpkg install sqlite3:x64-linux-dynamic --overlay-triplets=../custom-triplets
~/git$ vcpkg/vcpkg install sqlite3:x64-linux-dynamic --overlay-triplets=custom-triplets
The following packages will be built and installed:
sqlite3[core]:x64-linux
sqlite3[core]:x64-linux-dynamic
Starting package 1/1: sqlite3:x64-linux-dynamic
Building package sqlite3[core]:x64-linux-dynamic...
-- Loading triplet configuration from: /home/custom-triplets/x64-linux-dynamic.cmake
-- Loading triplet configuration from: /home/victor/git/custom-triplets/x64-linux-dynamic.cmake
-- Downloading https://sqlite.org/2019/sqlite-amalgamation-3280000.zip...
-- Extracting source /home/victor/git/vcpkg/downloads/sqlite-amalgamation-3280000.zip
-- Applying patch fix-arm-uwp.patch
@ -84,7 +59,7 @@ The package sqlite3:x64-linux-dynamic provides CMake targets:
target_link_libraries(main PRIVATE sqlite3)
```
Overlay triplets will add your custom triplet files when using `vcpkg install`, `vcpkg update`, `vcpkg upgrade`, and `vcpkg remove`.
Overlay triplets enables your custom triplet files when using `vcpkg install`, `vcpkg update`, `vcpkg upgrade`, and `vcpkg remove`.
When using the `--overlay-triplets` option, a message like the following lets you know that a custom triplet is being used:
@ -94,40 +69,33 @@ When using the `--overlay-triplets` option, a message like the following lets yo
## Overriding default triplets
As you may have noticed, the default triplets for Windows (`x86-windows` and `x64-windows`) install dynamic libraries, while a suffix (`-static`) is needed for static libraries. This is inconsistent with Linux and Mac OS where only static libraries are built.
As you may have noticed, the default triplets for Windows (`x86-windows` and `x64-windows`) install dynamic libraries, while a suffix (`-static`) is needed for static libraries. This is different with Linux and Mac OS where static libraries are built by `x64-linux` and `x64-osx`.
Using `--overlay-ports` it is possible to override the default triplets to accomplish the same behavior on Linux:
* `x64-linux`: Builds dynamic libraries,
* `x64-linux-static`: Builds static libraries.
### Step 1: Create the overriden triplet
### Step 1: Create the overlay triplets
Using the custom triplet created in the previous example, rename `custom-triplets/x64-linux-dynamic.cmake` to `custom-triplets/x64-linux.cmake`.
Using the custom triplet created in the previous example, rename `custom-triplets/x64-linux-dynamic.cmake` to `custom-triplets/x64-linux.cmake`. Then, copy the default `x64-linux` triplet (which builds static libraries) in your `custom-triplets` folder and rename it to `x64-linux-static.cmake`.
```
~/vcpkg$ mv ../custom-triplets/x64-linux-dynamic.cmake ../custom-triplets/x64-linux.cmake
```sh
~/git$ mv custom-triplets/x64-linux-dynamic.cmake custom-triplets/x64-linux.cmake
~/git$ cp vcpkg/triplets/x64-linux.cmake custom-triplets/x64-linux-static.cmake
```
### Step 2: Copy and rename the default triplet
Then, copy the default `x64-linux` triplet (which builds static libraries) in your `/custom-triplets` folder and rename it to `x64-linux-static.cmake`.
```
~/vcpkg$ cp ./triplets/x64-linux.cmake ../custom-triplets/x64-linux-static.cmake
```
### Step 3: Use `--overlay-ports` to override default triplets
### Step 2: Use `--overlay-ports` to override default triplets
Use the `--overlay-triplets` option to include the triplets in the `custom-triplets` directory.
```
./vcpkg install sqlite3:x64-linux --overlay-triplets=../custom-triplets
~/git$ vcpkg/vcpkg install sqlite3:x64-linux --overlay-triplets=custom-triplets
The following packages will be built and installed:
sqlite3[core]:x64-linux
Starting package 1/1: sqlite3:x64-linux
Building package sqlite3[core]:x64-linux...
-- Loading triplet configuration from: /home/custom-triplets/x64-linux.cmake
-- Loading triplet configuration from: /home/victor/git/custom-triplets/x64-linux.cmake
-- Downloading https://sqlite.org/2019/sqlite-amalgamation-3280000.zip...
-- Extracting source /home/victor/git/vcpkg/downloads/sqlite-amalgamation-3280000.zip
-- Applying patch fix-arm-uwp.patch
@ -154,5 +122,5 @@ The package sqlite3:x64-linux provides CMake targets:
Note that the default triplet is masked by your custom triplet:
```
-- Loading triplet configuration from: /home/custom-triplets/x64-linux.cmake
-- Loading triplet configuration from: /home/victor/git/custom-triplets/x64-linux.cmake
```

View File

@ -21,6 +21,11 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too
- [Portfile functions](maintainers/portfile-functions.md)
- [Maintainer Guidelines](maintainers/maintainer-guide.md)
### Tool Maintainer Help
- [Testing](tool-maintainers/testing.md)
- [Maintainer Guidelines](maintainers/maintainer-guide.md)
### Specifications
- [Export](specifications/export-command.md)

View File

@ -0,0 +1,162 @@
Testing
=======
Testing vcpkg is important whenever one makes changes to the tool itself, and
writing new tests and keeping them up to date is also very important. If one's
code is subtly broken, we'd rather find it out right away than a few weeks down
the line when someone complains!
Running Tests
-------------
Before anything else, we should know whether you can actually run the tests!
All you should need is a way to build vcpkg -- anything will do! All you have to
do is follow the guide 😄
With `$VCPKG_DIRECTORY` being the directory where you have cloned vcpkg, create
a build directory in `$VCPKG_DIRECTORY/toolsrc` (commonly named `out`), and
`cd` into it. Make sure to clean it out if it already exists!
```sh
$ cmake .. -DCMAKE_BUILD_TYPE=Debug -G Ninja
$ cmake --build .
$ ./vcpkg-test # ./vcpkg-test [$SPECIFIC_TEST] for a specific set of tests
$ # i.e., ./vcpkg-test [arguments]
```
If you make any modifications to `vcpkg`, you'll have to do the
`cmake --build .` step again.
Writing Tests
-------------
In your journey to write new tests, and to modify existing tests, reading the
[Catch2 documentation] will be very helpful! Come back after reading those 😀
You'll want to place your tests in one of the existing files, or, if it doesn't
belong in any of those, in a [new file](#adding-new-test-files).
The layout of these tests is as follows:
```cpp
// ... includes
TEST_CASE("Name of test", "[filename without the .cpp]") {
// setup and the like
REQUIRE(some boolean expression);
}
// etc.
```
You want to give these test cases good, descriptive, unique names, like
`SourceParagraph construct minimum` -- it doesn't need to be extremely clear
english, and shorthand is good, but make sure it's clear what the test is from
the name. For the latter parameter, known as "tags", you should at least put the
name of the file which the test case is in -- e.g., in `arguments.cpp`, you'd
tag all of the test cases with `[arguments]`.
If you wish to add helper functions, make sure to place them in an anonymous
namespace -- this will ensure that they don't trample over anybody else's
space. Additionally, there are a few helper functions that live in
`<vcpkg-test/util.h>` and `src/vcpkg-test/util.cpp` -- make sure to look into
them so that you're not rewriting functionality.
That should be all you need to know to start writing your own tests!
Remember to check out the [Catch2 documentation]
if you'd like to get more advanced with your tests,
and good luck on your testing journey!
Adding New Test Files
---------------------
Adding new test files should be easy and straightforward. All it requires is
creating a new source file in `toolsrc/src/vcpkg-test`, and then rerunning
`CMake` in order to pick up the glob changes.
### Example
Let's try writing a new test file called `example` (very creative, I know).
First, we should create a file, `example.cpp`, in `toolsrc/src/vcpkg-test`:
```cpp
// vcpkg-test/example.cpp
#include <vcpkg-test/catch.h>
```
This is the minimum file needed for tests; let's rebuild our CMake directory.
You'll have to clean out the existing `out` directory for CMake to rerun
globbing.
```sh
$ cmake .. -DCMAKE_BUILD_TYPE=Debug -G Ninja
# ...
-- Build files have been written to: $VCPKG_DIRECTORY/toolsrc/out
$ cmake --build .
[80/80] Linking CXX executable vcpkg.exe
```
Okay, now let's make sure this worked; add a test case to `example.cpp`:
```cpp
TEST_CASE("Example 1 - fail", "[example]") {
REQUIRE(false);
}
```
Now build the tests again, and run them:
```sh
$ cmake --build .
[2/2] Linking CXX executable vcpkg-test.exe
$ ./vcpkg-test
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
vcpkg-test.exe is a Catch v2.9.1 host application.
Run with -? for options
-------------------------------------------------------------------------------
Example 1 - fail
-------------------------------------------------------------------------------
$VCPKG_DIRECTORY/toolsrc/src/vcpkg-test/example.cpp(3)
...............................................................................
$VCPKG_DIRECTORY/toolsrc/src/vcpkg-test/example.cpp(14): FAILED:
REQUIRE( false )
===============================================================================
test cases: 102 | 101 passed | 1 failed
assertions: 3611 | 3610 passed | 1 failed
```
Hopefully, that worked! It should compile correctly, and have one failing test.
Now let's try a more complex test, after deleting the old one;
```cpp
// add #include <vcpkg/base/strings.h> to the top of the file
namespace Strings = vcpkg::Strings;
TEST_CASE("Example 2 - success", "[example]") {
std::string hello = "Hello";
REQUIRE(Strings::case_insensitive_ascii_equals(hello, "hELLo"));
REQUIRE_FALSE(Strings::case_insensitive_ascii_starts_with(hello, "E"));
}
```
Now compile and build the tests, and this time let's only run our example tests:
```sh
$ cmake --build .
[2/2] Linking CXX executable vcpkg-test.exe
$ ./vcpkg-test [example]
Filters: [example]
===============================================================================
All tests passed (2 assertions in 1 test case)
```
Hopefully you have one test running and succeeding! If you have that, you have
succeeded at adding a new file to vcpkg's tests. Congratulations! Have fun on
the rest of your journey 🐱‍👤😁
[Catch2 documentation]: https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md#top

View File

@ -1,5 +1,5 @@
Source: ace
Version: 6.5.5-1
Version: 6.5.6
Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
Description: The ADAPTIVE Communication Environment

View File

@ -28,9 +28,9 @@ set(ACE_ROOT ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers)
set(ENV{ACE_ROOT} ${ACE_ROOT})
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ACE_wrappers/ace)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_5/ACE-src-6.5.5.zip"
FILENAME ACE-src-6.5.5.zip
SHA512 65696e6f2776fd9c015adb78a92f1c87edacde62ff11f20f88c416d4420a6fc6e5176412c5f93262d06e67b89717499f8108f68582f70fea6ce05466c53415e9
URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_6/ACE-src-6.5.6.zip"
FILENAME ACE-src-6.5.6.zip
SHA512 4ee42aafc86af159ab20dbb14c7c2a49bed733645f5cc3afa8cef3e9688ff929002f3420eb33e859afe10a534afc276340faa21d029fa56bd07bd9aed3403ab4
)
vcpkg_extract_source_archive(${ARCHIVE})

View File

@ -1,3 +1,3 @@
Source: ade
Version: 0.1.1d
Version: 0.1.1e
Description: ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution.

View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO opencv/ade
REF v0.1.1d
SHA512 c493cb57e59ba859ca0cbf5d48bae4233f22104dfb4a96864d07e9422bb700c27af2d53a602f2230d68b7bcc598920d0652c3d9fdf8fad94a7e5b4d21664a44e
REF v0.1.1e
SHA512 6271b3a6d23b155757a47b21f70cb169b0469501bd1a7c99aa91a76117387840e02b4c70dc4069b7c50408f760b9a7ea77527a30b4691048a1ee55dd94988dd5
HEAD_REF master
)

View File

@ -1,5 +1,5 @@
Source: alembic
Version: 1.7.11-2
Version: 1.7.11-4
Build-Depends: ilmbase, hdf5
Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.
Homepage: https://alembic.io/

View File

@ -1,30 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce0a8e0..229fc77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,7 +226,24 @@ INCLUDE_DIRECTORIES(${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY})
IF (USE_HDF5)
FIND_PACKAGE(ZLIB REQUIRED)
SET(ALEMBIC_WITH_HDF5 "1")
- INCLUDE("./cmake/AlembicHDF5.cmake")
+ #INCLUDE("./cmake/AlembicHDF5.cmake")
+ FIND_LIBRARY(HDF5_LIBRARIES_RELEASE
+ NAMES hdf5
+ PATHS ${HDF5_ROOT}/lib
+ )
+ MESSAGE(STATUS ${HDF5_LIBRARIES_RELEASE})
+ FIND_LIBRARY(HDF5_LIBRARIES_DEBUG
+ NAMES hdf5_D
+ PATHS ${HDF5_ROOT}/debug/lib
+ )
+ MESSAGE(STATUS ${HDF5_LIBRARIES_DEBUG})
+ SET(HDF5_LIBRARIES
+ optimized ${HDF5_LIBRARIES_RELEASE}
+ debug ${HDF5_LIBRARIES_DEBUG}
+ )
+ SET(HDF5_INCLUDE_DIRS
+ ${HDF5_ROOT}/include
+ )
INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIRS})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DH5_USE_18_API")
ENDIF()

View File

@ -1,17 +0,0 @@
diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
index 5028c91..1f81d50 100644
--- a/lib/Alembic/CMakeLists.txt
+++ b/lib/Alembic/CMakeLists.txt
@@ -49,6 +49,12 @@ ADD_SUBDIRECTORY(AbcMaterial)
ADD_SUBDIRECTORY(Ogawa)
ADD_LIBRARY(Alembic ${LIB_TYPE} ${CXX_FILES})
+IF (USE_HDF5)
+ TARGET_LINK_LIBRARIES(Alembic
+ ${HDF5_LIBRARIES}
+ )
+ ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)
+ENDIF()
TARGET_INCLUDE_DIRECTORIES(Alembic
PUBLIC

View File

@ -16,16 +16,14 @@ vcpkg_from_github(
SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
HEAD_REF master
PATCHES
fix-hdf5link.patch
bypass-findhdf5.patch
fix-C1083.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DUSE_HDF5=ON
-DHDF5_ROOT=${CURRENT_INSTALLED_DIR}
)
vcpkg_install_cmake()

View File

@ -1,3 +1,3 @@
Source: ampl-mp
Version: 2019-03-21
Version: 2019-03-21-1
Description: An open-source library for mathematical programming

View File

@ -20,6 +20,7 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBUILD=asl
-DBUILD_TESTING=OFF

View File

@ -1,4 +1,4 @@
Source: amqpcpp
Version: 4.1.4
Version: 4.1.5
Description: AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker
Build-Depends: openssl (linux)

View File

@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO CopernicaMarketingSoftware/AMQP-CPP
REF v4.1.4
SHA512 d589756ad8e27ce6b6772128479083293c4dbb8c7aa79b7b08f0036ced9ab76ecb75e55458f04de8e2745c9732a6322f4e910f3f8611633c5cd5c35fb7dcaed1
REF v4.1.5
SHA512 71c54ddf43230fb3e9726257b073d117a329030052f768f985c2e9ebde5a320f0042d2ef67604b87940bfa1ed61339c334af0362238d10f30845521dff8ce43c
HEAD_REF master
PATCHES
find-openssl.patch

View File

@ -1,4 +1,4 @@
Source: anax
Version: 2.1.0-5
Version: 2.1.0-6
Description: An open source C++ entity system.
Homepage: https://github.com/miguelmartin75/anax

View File

@ -14,6 +14,7 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE
)

View File

@ -1,5 +1,5 @@
Source: apr
Version: 1.6.5-1
Version: 1.6.5-2
Homepage: https://apr.apache.org/
Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.

View File

@ -22,6 +22,7 @@ endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DINSTALL_PDB=OFF
-DMIN_WINDOWS_VER=Windows7

View File

@ -1,3 +1,3 @@
Source: argh
Version: 2018-12-18
Version: 2018-12-18-1
Description: Argh! A minimalist argument handler.

View File

@ -13,6 +13,7 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DBUILD_TESTS=OFF
-DBUILD_EXAMPLES=OFF

View File

@ -1,5 +1,5 @@
Source: azure-storage-cpp
Version: 6.1.0
Version: 6.1.0-2
Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext
Description: Microsoft Azure Storage Client SDK for C++
A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client.

View File

@ -13,10 +13,12 @@ vcpkg_from_github(
PATCHES
# on osx use the uuid.h that is part of the osx sdk
builtin-uuid-osx.patch
remove-gcov-dependency.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/Microsoft.WindowsAzure.Storage
PREFER_NINJA
OPTIONS
-DCMAKE_FIND_FRAMEWORK=LAST
-DBUILD_TESTS=OFF

View File

@ -0,0 +1,14 @@
diff --git a/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
index 6443f8e..db20749 100644
--- a/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
+++ b/Microsoft.WindowsAzure.Storage/src/CMakeLists.txt
@@ -63,9 +63,6 @@ if(UNIX OR WIN32)
)
endif()
-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}")
else()

View File

@ -1,5 +1,5 @@
Source: basisu
Version: 0.0.1
Version: 0.0.1-1
Homepage: https://github.com/BinomialLLC/basis_universal
Description: Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats.
Build-Depends: lodepng

View File

@ -10,6 +10,7 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBUILD_TESTS=OFF
)

View File

@ -1,5 +1,5 @@
Source: blosc
Version: 1.16.3-1
Version: 1.17.0
Build-Depends: lz4, snappy, zlib, zstd
Homepage: https://github.com/Blosc/c-blosc
Description: A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`

View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Blosc/c-blosc
REF v1.16.3
SHA512 2ff67a6e955a641c3a2330140e5887d0ce3fdcbf6b205507798a4e848a35ba2e22bf8fd91133291bc73c4e48fb01c02139e47ab8e4774d0e2288872e625c9ffd
REF v1.17.0
SHA512 7fe517e9d050a36839ddf963e718881533cc10a7c8963222b3167fd48ec84455614206c1cc2c248f52042a019262fa0419c4c1a828eb1ae64294c55bbaf56f6e
HEAD_REF master
)
@ -20,6 +20,7 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/internal-complibs)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DPREFER_EXTERNAL_LZ4=ON
-DPREFER_EXTERNAL_SNAPPY=ON
-DPREFER_EXTERNAL_ZLIB=ON

View File

@ -1,6 +1,6 @@
Source: bond
Maintainer: bond@microsoft.com
Version: 8.1.0-2
Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
Homepage: https://github.com/Microsoft/bond
Build-Depends: rapidjson, boost-config, boost-utility, boost-assign
Source: bond
Maintainer: bond@microsoft.com
Version: 8.1.0-2
Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.
Homepage: https://github.com/Microsoft/bond
Build-Depends: rapidjson, boost-config, boost-utility, boost-assign

View File

@ -1,6 +1,6 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-callable-traits
Version: 1.70.0
Version: 2.3.2
Build-Depends: boost-vcpkg-helpers
Homepage: https://github.com/boostorg/callable_traits
Description: Boost callable_traits module

View File

@ -5,8 +5,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/callable_traits
REF boost-1.70.0
SHA512 73742aa4094cef8f4b24833036f99449343dd6c572919db8fb464f76dc527d99a5a57e52bbfe6b20089041aa43ecb7a87ec528a7aea2fef5a8b15f6ced553769
REF 2.3.2
SHA512 32d69cc0bdaecfcf69f9e6079f6b80738ea95937cb2ef802d4d26771745c0d7179c9074ed6312ef1c2d45cf1711979ecf9a8407677d18e625bfb859bca1aa319
HEAD_REF master
)

View File

@ -1,6 +1,6 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-mpi
Version: 1.70.0-1
Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-property-map, boost-python (windows), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, msmpi
Version: 1.70.0-2
Build-Depends: boost-assert, boost-build, boost-compatibility, boost-config, boost-core, boost-foreach, boost-function, boost-graph, boost-integer, boost-iterator, boost-lexical-cast, boost-math, boost-modular-build-helper, boost-mpl, boost-optional, boost-property-map, boost-python (windows), boost-serialization, boost-smart-ptr, boost-static-assert, boost-throw-exception, boost-type-traits, boost-utility, boost-vcpkg-helpers, mpi
Homepage: https://github.com/boostorg/mpi
Description: Boost mpi module

View File

@ -368,7 +368,7 @@ foreach ($library in $libraries)
}
elseif ($library -eq "mpi")
{
$deps += @("msmpi")
$deps += @("mpi")
}
Generate `

6
ports/brigand/CONTROL Normal file
View File

@ -0,0 +1,6 @@
Source: brigand
Version: 1.3.0
Homepage: https://github.com/edouarda/brigand
Description: Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.
Build-Depends: boost

View File

@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13ea689..9d20700 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -292,3 +292,9 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/brigand
install(FILES ${CMAKE_BINARY_DIR}/libbrigand.pc
DESTINATION lib/pkgconfig
)
+
+install(TARGETS brigand
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+)

View File

@ -0,0 +1,29 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO edouarda/brigand
REF 1.3.0
SHA512 538d288d84265cc9a4563f1e84d55a174db461ffd1e4f510bfdaef04af9fbf8e7ca79817f9118378bf7d58d578699aae3072bbffa3fd727b2d93ee783337aea6
HEAD_REF master
PATCHES fix-install-targets.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/pkgconfig)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)

View File

@ -1,4 +1,7 @@
Source: bullet3
Version: 2.88
Version: 2.88-1
Homepage: https://github.com/bulletphysics/bullet3
Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library
Feature: multithreading
Description: Multithreading funcitonality for bullet3

View File

@ -10,8 +10,14 @@ vcpkg_from_github(
HEAD_REF master
)
set(BULLET_MULTITHREADING OFF)
if ("multithreading" IN_LIST FEATURES)
set(BULLET_MULTITHREADING ON)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON
-DBUILD_DEMOS=OFF
@ -21,6 +27,7 @@ vcpkg_configure_cmake(
-DBUILD_EXTRAS=OFF
-DBUILD_UNIT_TESTS=OFF
-DINSTALL_LIBS=ON
-DBULLET2_MULTITHREADING=${BULLET_MULTITHREADING}
)
vcpkg_install_cmake()

View File

@ -1,5 +1,5 @@
Source: capnproto
Version: 0.7.0-2
Version: 0.7.0-3
Description: Data interchange format and capability-based RPC system
Homepage: https://capnproto.org/
Build-Depends: zlib

View File

@ -15,7 +15,10 @@ vcpkg_from_github(
PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-capnpc-extension-handling-on-Windows.patch"
)
vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_install_cmake()

View File

@ -1,22 +1,13 @@
cmake_minimum_required(VERSION 3.9)
project(CascLib)
set(HEADER_FILES
src/CascCommon.h
src/CascLib.h
src/CascLib.def
src/CascPort.h
src/common/Array.h
src/common/Common.h
src/common/Csv.h
src/common/FileStream.h
src/common/FileTree.h
src/common/ListFile.h
src/common/Map.h
src/jenkins/lookup.h
)
project(casclib)
set(PROJECT_VERSION_MAJOR 1)
set(PROJECT_VERSION_MINOR 50)
option(INSTALL_HEADERS "Install header files" ON)
set(SRC_FILES
src/CascLib.def
src/CascCommon.cpp
src/CascDecompress.cpp
src/CascDecrypt.cpp
@ -57,18 +48,36 @@ set(ZLIB_FILES
src/zlib/zutil.c
)
add_library(casclib ${SRC_FILES} ${ZLIB_FILES} ${MD5_FILES})
target_include_directories(casclib
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:include/casclib>)
if(WIN32)
add_definitions(-DUNICODE -D_UNICODE)
target_compile_definitions(casclib PRIVATE UNICODE _UNICODE)
endif()
add_library(CascLib ${SRC_FILES} ${HEADER_FILES} ${TOMCRYPT_FILES} ${ZLIB_FILES} ${MD5_FILES})
install(TARGETS casclib
EXPORT casclibTargets
RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
)
set_target_properties(CascLib PROPERTIES PUBLIC_HEADER "src/CascLib.h;src/CascPort.h")
include(CMakePackageConfigHelpers)
install(TARGETS CascLib
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
FRAMEWORK DESTINATION /Library/Frameworks
PUBLIC_HEADER DESTINATION include
INCLUDES DESTINATION include)
set(VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/temp/casclibConfigVersion.cmake")
set(PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/temp/casclibConfig.cmake")
set(INSTALL_DIR "share/casclib")
write_basic_package_version_file("${VERSION_CONFIG}" VERSION 1.50 COMPATIBILITY SameMajorVersion)
configure_package_config_file("Config.cmake.in"
"${PROJECT_CONFIG}"
INSTALL_DESTINATION "${INSTALL_DIR}")
install(FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" DESTINATION "${INSTALL_DIR}")
install(EXPORT casclibTargets DESTINATION "${INSTALL_DIR}")
if(INSTALL_HEADERS)
install(FILES "src/CascLib.h" "src/CascPort.h" DESTINATION include/casclib)
endif()

View File

@ -1,4 +1,4 @@
Source: casclib
Version: 1.50
Version: 1.50-1
Build-Depends: zlib
Description: An open-source implementation of library for reading CASC storage from Blizzard games since 2014
Description: An open-source implementation of library for reading CASC storage from Blizzard games since 2014

View File

@ -0,0 +1,7 @@
@PACKAGE_INIT@
include(CMakeFindDependencyMacro)
find_dependency(ZLIB REQUIRED)
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
check_required_components("@PROJECT_NAME@")

View File

@ -10,14 +10,24 @@ vcpkg_from_github(
ctype_for_mac.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY
${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in
DESTINATION
${SOURCE_PATH}
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG
-DINSTALL_HEADERS=OFF
)
vcpkg_install_cmake()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/casclib RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_fixup_cmake_targets()
file(INSTALL ${SOURCE_PATH}/LICENSE
DESTINATION ${CURRENT_PACKAGES_DIR}/share/casclib
RENAME copyright)

View File

@ -1,4 +1,4 @@
Source: catch2
Version: 2.7.2-2
Version: 2.9.1-1
Description: A modern, header-only test framework for unit testing.
Homepage: https://github.com/catchorg/Catch2

View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO catchorg/Catch2
REF v2.7.2
SHA512 ac58cb3b676c73a361a494492e7b1f1b85cba7d08feb2d09b2269109a89b66aa37efead6b0a9fca64678f42a3395a3b02b6d461b4cb35310451ce849a79d04ae
REF v2.9.1
SHA512 ea18eef1fece72518c8a46b89727f5d0545a15038957087324abe6421c682693379476ff46106132f080677ebcc1c9ead51a9cf25dced3bb576a33e4f6fae4f6
HEAD_REF master
)

View File

@ -1,5 +1,5 @@
Source: ccfits
Version: 2.5-2
Version: 2.5-3
Homepage: https://heasarc.gsfc.nasa.gov/fitsio/ccfits
Description: CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.
Build-Depends: cfitsio

View File

@ -1,10 +1,7 @@
Index: FITS.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- FITS.h (date 1502267716000)
+++ FITS.h (revision )
diff --git a/FITS.h b/FITS.h
index e21f3db..3e97c83 100644
--- a/FITS.h
+++ b/FITS.h
@@ -21,6 +21,8 @@
#include "HDUCreator.h"
// FitsError
@ -14,42 +11,33 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
namespace CCfits {
class FITSBase;
@@ -665,9 +667,8 @@
@@ -665,7 +667,7 @@ do this either).
- class FITS
- {
-
+ class CCFITS_EXPORT FITS
+ {
+ class CCFITS_EXPORT FITS
{
public:
Index: HDU.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- HDU.h (date 1502267716000)
+++ HDU.h (revision )
@@ -568,7 +568,7 @@
diff --git a/HDU.h b/HDU.h
index 07f68e7..047e731 100644
--- a/HDU.h
+++ b/HDU.h
@@ -568,7 +568,7 @@ and return its value.
- class HDU
+ class CCFITS_EXPORT HDU
+ class CCFITS_EXPORT HDU
{
public:
Index: Table.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- Table.h (date 1502267716000)
+++ Table.h (revision )
@@ -268,7 +268,7 @@
diff --git a/Table.h b/Table.h
index a0c1afe..9a8a5db 100644
--- a/Table.h
+++ b/Table.h
@@ -268,7 +268,7 @@ namespace CCfits {
@ -58,19 +46,16 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
Index: Column.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- Column.h (date 1502267716000)
+++ Column.h (revision )
@@ -838,14 +838,14 @@
diff --git a/Column.h b/Column.h
index e4496a7..b798947 100644
--- a/Column.h
+++ b/Column.h
@@ -838,14 +838,14 @@ namespace CCfits {
- class Column
+ class CCFITS_EXPORT Column
+ class CCFITS_EXPORT Column
{
public:
@ -82,7 +67,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
RangeError (const String& msg, bool silent = true);
@@ -857,7 +857,7 @@
@@ -857,7 +857,7 @@ namespace CCfits {
@ -91,7 +76,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
InvalidDataType (const String& str = string(), bool silent = true);
@@ -869,7 +869,7 @@
@@ -869,7 +869,7 @@ namespace CCfits {
@ -100,7 +85,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
InvalidRowParameter (const String& diag, bool silent = true);
@@ -881,7 +881,7 @@
@@ -881,7 +881,7 @@ namespace CCfits {
@ -109,7 +94,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
WrongColumnType (const String& diag, bool silent = true);
@@ -893,7 +893,7 @@
@@ -893,7 +893,7 @@ namespace CCfits {
@ -118,7 +103,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
UnspecifiedLengths (const String& diag, bool silent = true);
@@ -905,7 +905,7 @@
@@ -905,7 +905,7 @@ namespace CCfits {
@ -127,7 +112,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
InvalidRowNumber (const String& diag, bool silent = true);
@@ -917,7 +917,7 @@
@@ -917,7 +917,7 @@ namespace CCfits {
@ -136,7 +121,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
InsufficientElements (const String& msg, bool silent = true);
@@ -929,7 +929,7 @@
@@ -929,7 +929,7 @@ namespace CCfits {
@ -145,7 +130,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
NoNullValue (const String& diag, bool silent = true);
@@ -941,7 +941,7 @@
@@ -941,7 +941,7 @@ namespace CCfits {
@ -154,14 +139,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
InvalidNumberOfRows (int number, bool silent = true);
Index: AsciiTable.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- AsciiTable.h (date 1502267716000)
+++ AsciiTable.h (revision )
@@ -133,7 +133,7 @@
diff --git a/AsciiTable.h b/AsciiTable.h
index 620cf41..d03aa44 100644
--- a/AsciiTable.h
+++ b/AsciiTable.h
@@ -133,7 +133,7 @@ namespace CCfits {
@ -170,14 +152,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
Index: CCfits.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- CCfits.h (date 1502267716000)
+++ CCfits.h (revision )
@@ -23,7 +23,7 @@
diff --git a/CCfits.h b/CCfits.h
index d09438a..a62b8a6 100644
--- a/CCfits.h
+++ b/CCfits.h
@@ -23,7 +23,7 @@ namespace CCfits {
#include <sys/types.h>
#include "longnam.h"
#include "float.h"
@ -186,7 +165,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
namespace CCfits {
/*! \namespace CCfits
@@ -32,8 +32,8 @@
@@ -32,8 +32,8 @@ namespace CCfits {
static const int BITPIX = -32;
static const int NAXIS = 2;
static const int MAXDIM = 99;
@ -197,46 +176,37 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
extern char BSCALE[7];
extern char BZERO[6];
Index: FITSBase.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- FITSBase.h (date 1502267716000)
+++ FITSBase.h (revision )
@@ -30,7 +30,7 @@
diff --git a/FITSBase.h b/FITSBase.h
index 996fdae..0c985f9 100644
--- a/FITSBase.h
+++ b/FITSBase.h
@@ -30,7 +30,7 @@ namespace CCfits {
- class FITSBase
+ class CCFITS_EXPORT FITSBase
+ class CCFITS_EXPORT FITSBase
{
public:
Index: Keyword.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- Keyword.h (date 1502267716000)
+++ Keyword.h (revision )
@@ -195,7 +195,7 @@
diff --git a/Keyword.h b/Keyword.h
index 816c119..b6df1f1 100644
--- a/Keyword.h
+++ b/Keyword.h
@@ -195,7 +195,7 @@ namespace CCfits {
- class Keyword
+ class CCFITS_EXPORT Keyword
+ class CCFITS_EXPORT Keyword
{
public:
Index: ExtHDU.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ExtHDU.h (date 1502267716000)
+++ ExtHDU.h (revision )
@@ -435,7 +435,7 @@
diff --git a/ExtHDU.h b/ExtHDU.h
index d075fa1..e2d7dc6 100644
--- a/ExtHDU.h
+++ b/ExtHDU.h
@@ -435,7 +435,7 @@ namespace CCfits {
@ -245,14 +215,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
Index: PHDU.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- PHDU.h (date 1502267716000)
+++ PHDU.h (revision )
@@ -264,7 +264,7 @@
diff --git a/PHDU.h b/PHDU.h
index fe5f799..d9669b4 100644
--- a/PHDU.h
+++ b/PHDU.h
@@ -264,7 +264,7 @@ namespace CCfits {
@ -261,14 +228,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
Index: BinTable.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- BinTable.h (date 1502267716000)
+++ BinTable.h (revision )
@@ -127,7 +127,7 @@
diff --git a/BinTable.h b/BinTable.h
index 68851e3..906005a 100644
--- a/BinTable.h
+++ b/BinTable.h
@@ -127,7 +127,7 @@ namespace CCfits {
@ -277,63 +241,41 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
Index: Image.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- Image.h (date 1502267716000)
+++ Image.h (revision )
@@ -32,7 +32,7 @@
template <typename T>
- class Image
+ class Image
{
public:
Index: ColumnCreator.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ColumnCreator.h (date 1502267716000)
+++ ColumnCreator.h (revision )
@@ -28,7 +28,7 @@
diff --git a/ColumnCreator.h b/ColumnCreator.h
index 104bd4f..15cd0ea 100644
--- a/ColumnCreator.h
+++ b/ColumnCreator.h
@@ -28,7 +28,7 @@ namespace CCfits {
- class ColumnCreator
+ class CCFITS_EXPORT ColumnCreator
+ class CCFITS_EXPORT ColumnCreator
{
public:
Index: FitsError.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- FitsError.h (date 1502267716000)
+++ FitsError.h (revision )
@@ -14,6 +14,7 @@
diff --git a/FitsError.h b/FitsError.h
index 593723c..52941f6 100644
--- a/FitsError.h
+++ b/FitsError.h
@@ -13,6 +13,7 @@
//#include <exception>
//#include <iostream>
//#include <stl.h>
#include <string>
+#include "ccfits_export.h"
#include <string>
using std::string;
@@ -90,7 +91,7 @@
@@ -90,7 +91,7 @@ namespace CCfits {
- class FitsException
+ class CCFITS_EXPORT FitsException
+ class CCFITS_EXPORT FitsException
{
public:
FitsException (const string& msg, bool& silent);
@@ -109,7 +110,7 @@
@@ -109,7 +110,7 @@ namespace CCfits {
@ -342,40 +284,34 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
FitsError (int errornum, bool silent = true);
@@ -123,7 +124,7 @@
@@ -123,7 +124,7 @@ namespace CCfits {
- class FitsFatal
+ class CCFITS_EXPORT FitsFatal
+ class CCFITS_EXPORT FitsFatal
{
public:
FitsFatal (const string& diag);
Index: HDUCreator.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- HDUCreator.h (date 1502267716000)
+++ HDUCreator.h (revision )
@@ -35,7 +35,7 @@
diff --git a/HDUCreator.h b/HDUCreator.h
index 65b82b7..2b5f717 100644
--- a/HDUCreator.h
+++ b/HDUCreator.h
@@ -35,7 +35,7 @@ namespace CCfits {
- class HDUCreator
+ class CCFITS_EXPORT HDUCreator
+ class CCFITS_EXPORT HDUCreator
{
public:
Index: ccfits_export.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- ccfits_export.h (revision )
+++ ccfits_export.h (revision )
@@ -0,0 +1,42 @@
+
diff --git a/ccfits_export.h b/ccfits_export.h
new file mode 100644
index 0000000..a2540a6 100644
--- /dev/null
+++ b/ccfits_export.h
@@ -0,0 +1,41 @@
+#ifndef CCFITS_EXPORT_H
+#define CCFITS_EXPORT_H
+
@ -417,13 +353,11 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+#endif
+
+#endif
Index: FITSUtil.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- FITSUtil.h (date 1502267716000)
+++ FITSUtil.h (revision )
\ No newline at end of file
diff --git a/FITSUtil.h b/FITSUtil.h
index 762d430..e2eee33 100644
--- a/FITSUtil.h
+++ b/FITSUtil.h
@@ -22,6 +22,7 @@
#include <string>
// FitsError
@ -432,7 +366,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
#include <typeinfo>
@@ -287,21 +288,21 @@
@@ -287,21 +288,21 @@ object.
template <typename T>
void swap(std::vector<T>& left, std::vector<T>& right);
@ -459,7 +393,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
bool operator()(const string& left, const string& right) const;
};
@@ -323,7 +324,7 @@
@@ -323,7 +324,7 @@ object.
char** CharArray(const std::vector<string>& inArray);
@ -468,7 +402,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
template <typename S, typename T>
@@ -633,7 +634,7 @@
@@ -633,7 +634,7 @@ object.
@ -477,19 +411,78 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
{
public:
UnrecognizedType (string diag, bool silent = true);
Index: KeywordCreator.h
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- KeywordCreator.h (date 1502267716000)
+++ KeywordCreator.h (revision )
@@ -24,7 +24,7 @@
diff --git a/KeywordCreator.h b/KeywordCreator.h
index d878a26..b2c0c70 100644
--- a/KeywordCreator.h
+++ b/KeywordCreator.h
@@ -24,7 +24,7 @@ namespace CCfits {
- class KeywordCreator
+ class CCFITS_EXPORT KeywordCreator
+ class CCFITS_EXPORT KeywordCreator
{
public:
diff --git a/CCfits b/CCfits
index e9848c9..f30c9ad 100644
--- a/CCfits
+++ b/CCfits
@@ -2,20 +2,20 @@
#ifndef CCFITS
#define CCFITS 20031208
-#include <CCfits/CCfits.h>
+#include <CCfits.h>
-#include <CCfits/FITS.h>
-#include <CCfits/BinTable.h>
-#include <CCfits/AsciiTable.h>
-#include <CCfits/ColumnVectorData.h>
-#include <CCfits/ColumnData.h>
-#include <CCfits/ColumnT.h>
-#include <CCfits/ExtHDUT.h>
-#include <CCfits/KeywordT.h>
-#include <CCfits/KeyData.h>
-#include <CCfits/FitsError.h>
-#include <CCfits/FITSUtilT.h>
-#include <CCfits/PHDUT.h>
+#include <FITS.h>
+#include <BinTable.h>
+#include <AsciiTable.h>
+#include <ColumnVectorData.h>
+#include <ColumnData.h>
+#include <ColumnT.h>
+#include <ExtHDUT.h>
+#include <KeywordT.h>
+#include <KeyData.h>
+#include <FitsError.h>
+#include <FITSUtilT.h>
+#include <PHDUT.h>
#endif
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b958fc7..0b1fb4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,11 @@ IF (BUILD_SHARED_LIBS)
SET (LIB_TYPE SHARED)
ENDIF (BUILD_SHARED_LIBS)
+
+IF (NOT BUILD_SHARED_LIBS)
+ ADD_DEFINITIONS(-DCCFITS_STATIC_DEFINE)
+ENDIF()
+
FILE(GLOB H_FILES "*.h")
SET(H_FILES ${H_FILES} CCfits)
@@ -55,6 +60,7 @@ SET(SRC_FILES
)
ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${H_FILES} ${SRC_FILES})
+
TARGET_LINK_LIBRARIES(${LIB_NAME} ${CFITSIO_LIBRARY}
)

View File

@ -9,14 +9,11 @@ vcpkg_download_distfile(ARCHIVE
FILENAME "CCfits-2.5.tar.gz"
SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
)
vcpkg_extract_source_archive(${ARCHIVE})
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
vcpkg_apply_patches(
SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/CCfits
PATCHES "${CMAKE_CURRENT_LIST_DIR}/dll_exports.patch"
)
endif()
vcpkg_extract_source_archive_ex(
ARCHIVE ${ARCHIVE}
OUT_SOURCE_PATH SOURCE_PATH
PATCHES dll_exports.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}

View File

@ -1,4 +1,4 @@
Source: cgicc
Version: 3.2.19-1
Version: 3.2.19-2
Homepage: https://www.gnu.org/software/cgicc/
Description: GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web

View File

@ -15,6 +15,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
)

View File

@ -1,4 +1,4 @@
Source: chakracore
Version: 1.11.9
Version: 1.11.11
Homepage: https://github.com/Microsoft/ChakraCore
Description: Core part of the Chakra Javascript engine

View File

@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/ChakraCore
REF v1.11.9
SHA512 4703e28f04925074bfc2057dcccee0427aacdd48f7b9f715d08a9385e4de9e804e1620cd49e8b3db7cd330d00ecd374bfaa3205dbe1f3cfce51ed0eea439a55e
REF v1.11.11
SHA512 67fd364090632c4187c43dc7bb50d2a6cd18ebb2963f86b7f07c6394c243a94963dd9a1e2dc8f4ab9653ab1316921dbac2c1f5fa235e241e9c605e63f2551a10
HEAD_REF master
)

View File

@ -1,4 +1,4 @@
Source: charls
Version: 2.0.0-1
Version: 2.0.0-2
Homepage: https://github.com/team-charls/charls
Description: CharLS, a C++ JPEG-LS library implementation.

View File

@ -15,6 +15,7 @@ vcpkg_apply_patches(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBUILD_TESTING=OFF
)

View File

@ -1,5 +1,5 @@
Source: cjson
Version: 1.7.10-1
Version: 1.7.12
Description: Ultralightweight JSON parser in ANSI C
Feature: utils

View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DaveGamble/cJSON
REF v1.7.10
SHA512 f8d7c9fe798b51ec3c69cabe4124d2f6372f0e6d282285e3ca951c58c971a9a520d87550530d750ff7f8055c0b6ff566f237b9af9eb345cf4f4fc4ff8c910740
REF v1.7.12
SHA512 d767b7261eff3a1a50ea46cc5573f9504f5734a891ea211ad348835bfb4b80acf7f744da2d34bb1fa270cd4d44576c21bc6f52c0604b7e6ffdeb61ecb396b376
HEAD_REF master
PATCHES
fix-install-path.patch

View File

@ -1,4 +1,4 @@
Source: collada-dom
Version: 2.5.0-1
Version: 2.5.0-2
Description: The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.
Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system

View File

@ -14,6 +14,7 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_install_cmake()

View File

@ -26,13 +26,23 @@ foreach(_feature IN LISTS ALL_FEATURES)
endif()
endforeach()
if(NOT VCPKG_CMAKE_SYSTEM_NAME)
# building for Windows desktop
if (VCPKG_PLATFORM_TOOLSET STREQUAL "v142" AND NOT VCPKG_USE_HEAD_VERSION)
message("**********")
message("WARNING: Visual Studio 2019 is not official supported by Corrade/Magnum team. Please use --head version if you intend to have upstream support.")
message("**********")
set(_CUSTOM_BUILD_FLAGS "-DCORRADE_MSVC2017_COMPATIBILITY=ON")
endif()
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS
-DDUTILITY_USE_ANSI_COLORS=ON
-DUTILITY_USE_ANSI_COLORS=ON
-DBUILD_STATIC=${BUILD_STATIC}
-DCORRADE_MSVC2017_COMPATIBILITY=ON
${_CUSTOM_BUILD_FLAGS}
${_COMPONENT_FLAGS}
)

View File

@ -1,3 +1,3 @@
Source: cpp-taskflow
Version: 2018-11-30
Version: 2.2.0
Description: Fast Parallel Tasking Programming Library using Modern C++.

View File

@ -5,8 +5,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO cpp-taskflow/cpp-taskflow
REF 97252f7d782c6e896122645175c08131ce10e649
SHA512 df8ae9ea449663cb548f3c37346c2e0c785add2d86b9c618aea2741d81fe88c34b0d3d0e610a4b571973f9bc18631becedfe28e029ecf0c0cc87e4c35a280a29
REF v2.2.0
SHA512 c075f1b7e4dd6ed6d9561b860b660ee4b28eddb321d8aa8746fbec45b1039ab686700156e4273da5a4ac7af0707975331befd9bf3e51f18925ea3a9a60083549
HEAD_REF master
)

View File

@ -1,19 +1,23 @@
Source: cpprestsdk
Version: 2.10.14
Build-Depends: zlib, openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows), boost-asio (!uwp&!windows)
Version: 2.10.14-1
Build-Depends: openssl (!uwp&!windows), boost-system (!uwp&!windows), boost-date-time (!uwp&!windows), boost-regex (!uwp&!windows), boost-thread (!uwp&!windows), boost-filesystem (!uwp&!windows), boost-random (!uwp&!windows), boost-chrono (!uwp&!windows), boost-asio (!uwp&!windows)
Homepage: https://github.com/Microsoft/cpprestsdk
Description: C++11 JSON, REST, and OAuth library
The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.
Default-Features: default-features
Feature: default-features
Build-Depends: cpprestsdk[brotli] (windows), cpprestsdk[websockets]
Build-Depends: cpprestsdk[brotli] (windows), cpprestsdk[core], cpprestsdk[compression], cpprestsdk[websockets]
Description: Features installed by default
Feature: compression
Build-Depends: zlib
Description: HTTP Compression support
Feature: websockets
Build-Depends: websocketpp (!uwp), openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp)
Build-Depends: cpprestsdk[core], cpprestsdk[compression], websocketpp (!uwp), openssl (!uwp), boost-system (!uwp), boost-date-time (!uwp), boost-regex (!uwp)
Description: Websockets support
Feature: brotli
Build-Depends: brotli
Build-Depends: cpprestsdk[core], cpprestsdk[compression], brotli
Description: Brotli compression support

View File

@ -16,16 +16,21 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH})
endif()
set(CPPREST_EXCLUDE_WEBSOCKETS ON)
if("websockets" IN_LIST FEATURES)
set(CPPREST_EXCLUDE_WEBSOCKETS OFF)
endif()
set(CPPREST_EXCLUDE_BROTLI ON)
if ("brotli" IN_LIST FEATURES)
set(CPPREST_EXCLUDE_BROTLI OFF)
endif()
set(CPPREST_EXCLUDE_COMPRESSION ON)
if ("compression" IN_LIST FEATURES)
set(CPPREST_EXCLUDE_COMPRESSION OFF)
endif()
set(CPPREST_EXCLUDE_WEBSOCKETS ON)
if("websockets" IN_LIST FEATURES)
set(CPPREST_EXCLUDE_WEBSOCKETS OFF)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/Release
PREFER_NINJA
@ -33,6 +38,8 @@ vcpkg_configure_cmake(
${OPTIONS}
-DBUILD_TESTS=OFF
-DBUILD_SAMPLES=OFF
-DCPPREST_EXCLUDE_BROTLI=${CPPREST_EXCLUDE_BROTLI}
-DCPPREST_EXCLUDE_COMPRESSION=${CPPREST_EXCLUDE_COMPRESSION}
-DCPPREST_EXCLUDE_WEBSOCKETS=${CPPREST_EXCLUDE_WEBSOCKETS}
-DCPPREST_EXPORT_DIR=share/cpprestsdk
-DWERROR=OFF

View File

@ -1,5 +1,5 @@
Source: cppzmq
Version: 4.3.0-1
Version: 4.4.1
Build-Depends: zeromq
Homepage: https://github.com/zeromq/cppzmq
Description: lightweight messaging kernel, C++ bindings

View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zeromq/cppzmq
REF v4.3.0
SHA512 c9e08e48795b9043c689ffa6953ac59e0fe79d9110d79e06609ab67bf76bea52147b59ecf033f7a06e57d5eb0c3c6bc79634af789966ff22d7d80091d19b135d
REF v4.4.1
SHA512 5178a24413e44a6d99e57db7c9859c72279304272baa0e1fb810174cdf592cb567cab98428ef3ab611042bdf4bc506867421662409d1f0d82c233cb83ebdb801
HEAD_REF master
)

6
ports/ctbignum/CONTROL Normal file
View File

@ -0,0 +1,6 @@
Source: ctbignum
Version: 2019-08-02
Homepage: https://github.com/niekbouman/ctbignum
Description: This is a header-only template library for fixed-width "small big-integer" computations, for use during run-time as well as compile-time.
Build-Depends: boost

View File

@ -0,0 +1,30 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO niekbouman/ctbignum
REF cf3233d8b7dcff59f29a7389204959ee2228a4af
SHA512 8cd5e187836f48165a088a171c87ce438393e66f7362af1b67a253ae6ef0b17c41468e21e0dfe337094796f2b2a2fa5062cc9a9231afc377f187baf1ead1257e
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DCTBIGNUM_BuildTests=OFF
-DCTBIGNUM_BuildBenchmarks=OFF
)
vcpkg_install_cmake()
# Move CMake files to the right place
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
# Remove empty files
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib)
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)

View File

@ -1,4 +1,4 @@
Source: ctemplate
Version: 2017-06-23-44b7c5-3
Version: 2017-06-23-44b7c5-4
Homepage: https://github.com/OlafvdSpek/ctemplate
Description: C++ CTemplate system

View File

@ -14,6 +14,7 @@ vcpkg_find_acquire_program(PYTHON3)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DPYTHON_EXECUTABLE=${PYTHON3}
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
)

View File

@ -1,4 +1,4 @@
Source: cxxopts
Version: 2.1.2-1
Version: 2.2.0
Homepage: https://github.com/jarro2783/cxxopts
Description: This is a lightweight C++ option parser library, supporting the standard GNU style syntax for options

View File

@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO jarro2783/cxxopts
REF v2.1.2
SHA512 7ee3725995d4d0f78b75d1d87f10290f20529ca4aa430eb8dd1c59d98c6e99c54b54fc545926b59f499d02ae4f75f9064b3b5ebbab3f74031d3638e7a2378440
REF v2.2.0
SHA512 9f5182b3a86b3d47d1ce5e1e222ab596fce59d3b2dcc0ab2c3802338d5e0f3e6556f2a5ff2accb32cae7e2db41ac5a361c93bf0256f9e44c316eaa4b47c19efa
HEAD_REF master
)
@ -12,6 +12,7 @@ vcpkg_configure_cmake(
PREFER_NINJA
OPTIONS
-DCXXOPTS_BUILD_EXAMPLES=OFF
-DCXXOPTS_BUILD_TESTS=OFF
)
vcpkg_install_cmake()

View File

@ -1,5 +1,5 @@
Source: darknet
Version: 0.2.5-4
Version: 0.2.5-5
Description: Darknet is an open source neural network framework written in C and CUDA. You only look once (YOLO) is a state-of-the-art, real-time object detection system, best example of darknet functionalities.
Build-Depends: pthreads (windows), stb
Default-Features: weights
@ -13,7 +13,10 @@ Build-Depends: cuda
Description: Build darknet with support for CUDA
Feature: weights
Description: Download common weights from official websites, using vcpkg proxy-enabled functions
Description: Download pre-built weights for test
Feature: weights-train
Description: Download pre-built weights for training
Feature: opencv-cuda
Build-Depends: opencv[ffmpeg], opencv[cuda]

View File

@ -11,8 +11,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO AlexeyAB/darknet
REF a1abd07e23fc5b143a6197de9908fe4f33791c6a
SHA512 df91bf595666a4db5beb5cc55f6c60be19667ab987a784faef04cf2215317c9a340cfc0a200640741fcc88c29cff077d5153b86ff497c31ad5ad132f05987516
REF b2d795e34e1d734d0f451ce9847a0e6b68c32351
SHA512 1964aa0d768d37fc614983718aede8b29e562fd8120116b7cd7a1331bb8a3256e28c01cdff6f19bbe7b9d6289b3292188205f362bae38393cee33d8a2e6a5273
HEAD_REF master
)
@ -56,8 +56,22 @@ if("weights" IN_LIST FEATURES)
)
endif()
#make sure we don't use any integrated pre-built library
if("weights-train" IN_LIST FEATURES)
vcpkg_download_distfile(IMAGENET_CONV_WEIGHTS_V3
URLS "https://pjreddie.com/media/files/darknet53.conv.74"
FILENAME "darknet-cache/darknet53.conv.74"
SHA512 8983e1c129e2d6e8e3da0cc0781ecb7a07813830ef5a87c24b53100df6a5f23db6c6e6a402aec78025a93fe060b75d1958f1b8f7439a04b54a3f19c81e2ae99b
)
vcpkg_download_distfile(IMAGENET_CONV_WEIGHTS_V2
URLS "https://pjreddie.com/media/files/darknet19_448.conv.23"
FILENAME "darknet-cache/darknet19_448.conv.23"
SHA512 8016f5b7ddc15c5d7dad231592f5351eea65f608ebdb204f545034dde904e11962f693080dfeb5a4510e7b71bdda151a9121ba0f8a243018d680f01b1efdbd31
)
endif()
#make sure we don't use any integrated pre-built library nor any unnecessary CMake module
file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty)
file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindPThreads_windows.cmake)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
@ -72,7 +86,6 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
#somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it
if(CMAKE_HOST_WIN32)
set(EXECUTABLE_SUFFIX ".exe")
else()
@ -101,8 +114,6 @@ endif()
vcpkg_fixup_cmake_targets()
file(COPY ${SOURCE_PATH}/cmake/Modules/FindCUDNN.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/darknet)
file(COPY ${SOURCE_PATH}/cmake/Modules/FindPThreads_windows.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/darknet)
file(COPY ${SOURCE_PATH}/cmake/Modules/FindStb.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/darknet)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
@ -115,3 +126,8 @@ if("weights" IN_LIST FEATURES)
file(COPY ${VCPKG_ROOT_DIR}/downloads/darknet-cache/yolov3-tiny.weights DESTINATION ${CURRENT_PACKAGES_DIR}/tools/darknet)
file(COPY ${VCPKG_ROOT_DIR}/downloads/darknet-cache/yolov2-tiny.weights DESTINATION ${CURRENT_PACKAGES_DIR}/tools/darknet)
endif()
if("weights-train" IN_LIST FEATURES)
file(COPY ${VCPKG_ROOT_DIR}/downloads/darknet-cache/darknet53.conv.74 DESTINATION ${CURRENT_PACKAGES_DIR}/tools/darknet)
file(COPY ${VCPKG_ROOT_DIR}/downloads/darknet-cache/darknet19_448.conv.23 DESTINATION ${CURRENT_PACKAGES_DIR}/tools/darknet)
endif()

4
ports/discount/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: discount
Version: 2.2.6
Homepage: https://github.com/Orc/discount
Description: DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language.

34
ports/discount/blocktags Normal file
View File

@ -0,0 +1,34 @@
static struct kw blocktags[] = {
{ "P", 1, 0 },
{ "DL", 2, 0 },
{ "H1", 2, 0 },
{ "H2", 2, 0 },
{ "H3", 2, 0 },
{ "H4", 2, 0 },
{ "H5", 2, 0 },
{ "H6", 2, 0 },
{ "HR", 2, 1 },
{ "OL", 2, 0 },
{ "UL", 2, 0 },
{ "BDO", 3, 0 },
{ "DFN", 3, 0 },
{ "DIV", 3, 0 },
{ "MAP", 3, 0 },
{ "PRE", 3, 0 },
{ "WBR", 3, 0 },
{ "XMP", 3, 0 },
{ "FORM", 4, 0 },
{ "NOBR", 4, 0 },
{ "STYLE", 5, 0 },
{ "TABLE", 5, 0 },
{ "CENTER", 6, 0 },
{ "IFRAME", 6, 0 },
{ "OBJECT", 6, 0 },
{ "SCRIPT", 6, 0 },
{ "ADDRESS", 7, 0 },
{ "LISTING", 7, 0 },
{ "PLAINTEXT", 9, 0 },
{ "BLOCKQUOTE", 10, 0 },
};
#define NR_blocktags 30

View File

@ -0,0 +1,27 @@
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 3895fdb..a183836 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -182,7 +182,10 @@ if(${PROJECT_NAME}_MAKE_INSTALL)
target_include_directories(libmarkdown INTERFACE
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
- set(_TARGETS libmarkdown markdown)
+ set(_TARGETS libmarkdown)
+ if(NOT ${PROJECT_NAME}_ONLY_LIBRARY)
+ set(_TARGETS ${_TARGETS} markdown)
+ endif()
if(${PROJECT_NAME}_INSTALL_SAMPLES)
list(APPEND _TARGETS mkd2html makepage)
endif()
diff --git a/cmake/config.h.in b/cmake/config.h.in
index e08220d..e630934 100644
--- a/cmake/config.h.in
+++ b/cmake/config.h.in
@@ -74,4 +74,6 @@
#define TABSTOP @TABSTOP@
+#define DESTRUCTOR
+
#endif /* _CONFIG_D */

View File

@ -0,0 +1,16 @@
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 11fa675..34cc9ed 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -20,6 +20,11 @@ set(${PROJECT_NAME}_INSTALL_SAMPLES OFF CACHE BOOL
set(${PROJECT_NAME}_ONLY_LIBRARY OFF CACHE BOOL
"Set to ON to only build markdown library (default is OFF)")
+# MSVC deprecated warnings (C4996,strdup, ...)
+if(MSVC)
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
+endif()
+
# Check headers
include(CheckIncludeFile)
check_include_file(libgen.h HAVE_LIBGEN_H)

View File

@ -0,0 +1,29 @@
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index a183836..e9deef5 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -113,12 +115,19 @@ configure_file("${_ROOT}/mkdio.h.in"
include_directories("${_ROOT}")
-add_executable(mktags
- "${_ROOT}/mktags.c")
-add_custom_command(OUTPUT "${_ROOT}/blocktags"
- COMMAND mktags > blocktags
- WORKING_DIRECTORY "${_ROOT}")
+if(NOT GENERATE_BLOCKTAGS)
+ message(STATUS "Not generating blocktags")
+else()
+ message(STATUS "Using mktags to generate blocktags")
+
+ add_executable(mktags
+ "${_ROOT}/mktags.c")
+
+ add_custom_command(OUTPUT "${_ROOT}/blocktags"
+ COMMAND mktags > blocktags
+ WORKING_DIRECTORY "${_ROOT}")
+endif()
add_library(libmarkdown
"${_ROOT}/mkdio.c"

View File

@ -0,0 +1,45 @@
include(vcpkg_common_functions)
# No dynamic link for MSVC
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Orc/discount
REF v2.2.6
SHA512 4c5956dea78aacd3a105ddac13f1671d811a5b2b04990cdf8485c36190c8872c4b1b9432a7236f669c34b07564ecd0096632dced54d67de9eaf4f23641417ecc
HEAD_REF master
PATCHES
cmake.patch
generate-blocktags-command.patch
disable-deprecated-warnings.patch
)
set(GENERATE_BLOCKTAGS ON)
if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64" OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
set(GENERATE_BLOCKTAGS OFF)
endif()
if(NOT GENERATE_BLOCKTAGS)
configure_file("${CURRENT_PORT_DIR}/blocktags" "${SOURCE_PATH}/blocktags" COPYONLY)
message(STATUS "Copied blocktags")
endif()
vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}/cmake"
PREFER_NINJA
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DDISCOUNT_ONLY_LIBRARY=ON
-DGENERATE_BLOCKTAGS=${GENERATE_BLOCKTAGS}
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/discount)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
# Handle copyright
file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/discount" RENAME copyright)

View File

@ -1,4 +1,4 @@
Source: dlfcn-win32
Version: 1.1.1-1
Version: 1.1.1-2
Homepage: https://github.com/dlfcn-win32/dlfcn-win32
Description: dlfcn-win32 is an implementation of dlfcn for Windows.

View File

@ -22,6 +22,7 @@ vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_install_cmake()

View File

@ -1,5 +1,5 @@
Source: duktape
Version: 2.3.0-1
Version: 2.3.0-2
Homepage: https://github.com/svaarala/duktape
Description: Embeddable Javascript engine with a focus on portability and compact footprint.
Build-Depends:

View File

@ -48,6 +48,7 @@ vcpkg_apply_patches(
)
vcpkg_configure_cmake(
PREFER_NINJA
SOURCE_PATH ${SOURCE_PATH}
)

5
ports/easycl/CONTROL Normal file
View File

@ -0,0 +1,5 @@
Source: easycl
Version: 0.3
Homepage: https://github.com/architector1324/EasyCL
Build-Depends: opencl
Description: OpenCL based lightweight c++ computing library

View File

@ -0,0 +1,15 @@
include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO architector1324/EasyCL
REF 0.3
SHA512 c0e9aa03c9039e9ffe4794ccc4e85654f8267924e577cf96fd8d5e141fab9e8f6dc4668ee4475d6df3ba77572e52a181493acd3dfdb0abf7bd83b7e3d4d08a29
HEAD_REF master
)
# Handle headers
file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR} FILES_MATCHING PATTERN "*.hpp")
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/easycl RENAME copyright)

4
ports/easyhook/CONTROL Normal file
View File

@ -0,0 +1,4 @@
Source: easyhook
Version: 2.7.6789.0
Homepage: https://github.com/EasyHook/EasyHook
Description: This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.

View File

@ -0,0 +1,128 @@
diff --git a/EasyHookDll/EasyHookDll.vcxproj b/EasyHookDll/EasyHookDll.vcxproj
index ec66f91..5773555 100644
--- a/EasyHookDll/EasyHookDll.vcxproj
+++ b/EasyHookDll/EasyHookDll.vcxproj
@@ -188,7 +188,7 @@
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <SmallerTypeCheck>true</SmallerTypeCheck>
+ <SmallerTypeCheck>false</SmallerTypeCheck>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -207,10 +207,6 @@
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
- <PostBuildEvent>
- <Command>copy "$(TargetPath)" "$(TargetDir)..\x64\EasyHook32.dll"
-copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib"</Command>
- </PostBuildEvent>
<MASM>
<UseSafeExceptionHandlers>false</UseSafeExceptionHandlers>
</MASM>
@@ -223,7 +219,7 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib"</Command>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <SmallerTypeCheck>true</SmallerTypeCheck>
+ <SmallerTypeCheck>false</SmallerTypeCheck>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -242,10 +238,6 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib"</Command>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
- <PostBuildEvent>
- <Command>copy "$(TargetPath)" "$(TargetDir)..\x64\EasyHook32.dll"
-copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib"</Command>
- </PostBuildEvent>
<MASM>
<UseSafeExceptionHandlers>false</UseSafeExceptionHandlers>
</MASM>
@@ -261,7 +253,7 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib"</Command>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <SmallerTypeCheck>true</SmallerTypeCheck>
+ <SmallerTypeCheck>false</SmallerTypeCheck>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -278,10 +270,6 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib"</Command>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>
- <PostBuildEvent>
- <Command>copy "$(TargetPath)" "$(TargetDir)..\x86\EasyHook64.dll"
-copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib"</Command>
- </PostBuildEvent>
<MASM>
<UseSafeExceptionHandlers>false</UseSafeExceptionHandlers>
</MASM>
@@ -297,7 +285,7 @@ copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib"</Command>
<StringPooling>true</StringPooling>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <SmallerTypeCheck>true</SmallerTypeCheck>
+ <SmallerTypeCheck>false</SmallerTypeCheck>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -314,10 +302,6 @@ copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib"</Command>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>
- <PostBuildEvent>
- <Command>copy "$(TargetPath)" "$(TargetDir)..\x86\EasyHook64.dll"
-copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib"</Command>
- </PostBuildEvent>
<MASM>
<UseSafeExceptionHandlers>false</UseSafeExceptionHandlers>
</MASM>
@@ -355,10 +339,6 @@ copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib"</Command>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
- <PostBuildEvent>
- <Command>copy "$(TargetPath)" "$(TargetDir)..\x64\EasyHook32.dll"
-copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib"</Command>
- </PostBuildEvent>
<MASM>
<GenerateDebugInformation>false</GenerateDebugInformation>
<UseSafeExceptionHandlers>false</UseSafeExceptionHandlers>
@@ -397,10 +377,6 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib"</Command>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
- <PostBuildEvent>
- <Command>copy "$(TargetPath)" "$(TargetDir)..\x64\EasyHook32.dll"
-copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib"</Command>
- </PostBuildEvent>
<MASM>
<GenerateDebugInformation>false</GenerateDebugInformation>
<UseSafeExceptionHandlers>false</UseSafeExceptionHandlers>
@@ -439,10 +415,6 @@ copy "$(TargetDir)EasyHook32.lib" "$(TargetDir)..\x64\EasyHook32.lib"</Command>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX64</TargetMachine>
</Link>
- <PostBuildEvent>
- <Command>copy "$(TargetPath)" "$(TargetDir)..\x86\EasyHook64.dll"
-copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib"</Command>
- </PostBuildEvent>
<MASM>
<GenerateDebugInformation>false</GenerateDebugInformation>
<UseSafeExceptionHandlers>false</UseSafeExceptionHandlers>
@@ -481,10 +453,6 @@ copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib"</Command>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX64</TargetMachine>
</Link>
- <PostBuildEvent>
- <Command>copy "$(TargetPath)" "$(TargetDir)..\x86\EasyHook64.dll"
-copy "$(TargetDir)EasyHook64.lib" "$(TargetDir)..\x86\EasyHook64.lib"</Command>
- </PostBuildEvent>
<MASM>
<GenerateDebugInformation>false</GenerateDebugInformation>
<UseSafeExceptionHandlers>false</UseSafeExceptionHandlers>

View File

@ -0,0 +1,38 @@
include(vcpkg_common_functions)
if (NOT VCPKG_TARGET_IS_WINDOWS)
message(FATAL_ERROR "easyhook only support windows.")
endif()
if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "easyhook can only be built as dynamic library.")
endif()
message(".Net framework 4.0 is required, please install it before install easyhook.")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO EasyHook/EasyHook
REF v2.7.6789.0
SHA512 a48b4fe6dd2e55a2d515bc917c0f3ff5b73f08d1778e671df802347c3b8e1d4638005582a494acdf891ffe3fa6eae3eab0096083a8af2352e3f0883eb83421d6
HEAD_REF master
PATCHES fix-build.patch
)
vcpkg_install_msbuild(
SOURCE_PATH ${SOURCE_PATH}
PROJECT_SUBPATH EasyHook.sln
TARGET EasyHookDll
RELEASE_CONFIGURATION "netfx4-Release"
DEBUG_CONFIGURATION "netfx4-Debug"
)
# These libraries are useless, so remove.
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/EasyHook.dll ${CURRENT_PACKAGES_DIR}/bin/EasyHook.pdb)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.dll ${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.pdb)
# Install includes
file(INSTALL ${SOURCE_PATH}/Public/easyhook.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/easyhook)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/easyhook RENAME copyright)

View File

@ -1,3 +1,3 @@
Source: easyloggingpp
Version: 9.96.7
Version: 9.96.7-1
Description: Easylogging++ is a single header efficient logging library for C++ applications.

View File

@ -12,6 +12,7 @@ vcpkg_from_github(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-Dbuild_static_lib=ON
)

View File

@ -1,4 +1,4 @@
Source: ecm
Version: 5.58.0
Version: 5.60.0-1
Homepage: https://github.com/KDE/extra-cmake-modules
Description: Extra CMake Modules (ECM), extra modules and scripts for CMake

View File

@ -4,13 +4,14 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/extra-cmake-modules
REF v5.58.0
SHA512 c08408c5842789ce61d17642025edca022bcc0b78aba3d7dc0af5a6973f5f26ebe6f65e6d97e516e64eaf778d4a70397c76a96c45a6ee8bda3f2a9d9fff5966e
REF v5.60.0
SHA512 98c7cbb0a84fbd4806cdf84538cb16717cbbb13fa5cce5c4bf9a507a699c579fa6f88af5091b3d311bdd504a119d6147114b2fad5de2dfd5f18448bca60cdc92
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DBUILD_HTML_DOCS=OFF
-DBUILD_MAN_DOCS=OFF
-DBUILD_QTHELP_DOCS=OFF

View File

@ -1,4 +1,4 @@
Source: ecsutil
Version: 1.0.6.1-1
Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol.
Build-Depends: atlmfc (windows)
Source: ecsutil
Version: 1.0.7.2
Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol.
Build-Depends: atlmfc (windows)

View File

@ -28,8 +28,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO EMCECS/ecs-object-client-windows-cpp
REF v1.0.6.1
SHA512 4b16b9ce1dbc9f541fe95a40c10678cd2b0192acc94bc3d57e58fbdf37964af84cdc901686555aad1f58d133632b1ad6f57976a5ac71aed1fce2fb44a2d0f8d3
REF v1.0.7.2
SHA512 2505db74b370271bd9ad8e73248e3d29384ad9a6f1c8246203abe82f99ea8f75419482031024127361358c339955fd2a029a5c77f5ce6e7a35c18f1fc0635c88
HEAD_REF master
PATCHES NoLibSyms.patch
)

View File

@ -1,3 +1,3 @@
Source: fastfeat
Version: 391d5e9
Version: 391d5e9-1
Description: FAST feature detectors in C

View File

@ -17,6 +17,7 @@ DESTINATION ${SOURCE_PATH}
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS_DEBUG
-DDISABLE_INSTALL_HEADERS=ON
)

View File

@ -1,4 +1,4 @@
Source: fastlz
Version: 1.0-2
Version: 1.0-3
Homepage: https://github.com/ariya/FastLZ
Description: A lightning-fast lossless compression library

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