Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge from vcpkg #16

Merged
merged 162 commits into from
Oct 9, 2020
Merged

merge from vcpkg #16

merged 162 commits into from
Oct 9, 2020

Conversation

longhuan2018
Copy link
Owner

No description provided.

Neumann-A and others added 30 commits September 11, 2020 10:57
…#13240)

* add VCPKG_OVERLAY_(PORTS|TRIPLETS) to the toolchain

* move everything into additional manifest params

* fix me not thinking
* Update to 2.5.0

* Disable unit test building; 2.5.0 uses BUILD_TESTING flag

* Attempt to add /bigobj since I'm not sure how to disable building examples target

* Fix build error when building x64 targets

* Add more to the patch, remove sections with add_executable from CMakeLists.txt

* Guard with BUILD_TEST, put compile option in

* Disable CUDA

* Change name of package to taskflow

* Add patch so it's back to Cpp-Taskflow::Cpp-Taskflow...

* Update CONTROL

* Move - down to Port-Version.

* Add taskflow 2.6.0

* Update cpp-taskflow to 2.4.0 and disable test building

* Change 'cpp-taskflow' to merely depend on 'taskflow'.

* Remove osx skip.

* Fix up portfile and remove patch file since not needed for header-only

* Case fix for Linux

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [qhull] Extracted from #12199

* [qhull] Update to 8.0.2 release

Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* Fixing up _IMPORT_PREFIX.

* update version.

* address the feedback.
Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
* [qwt] update to 6.1.5

* delete patch file

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [freeimage] Add vcpkg-cmake-wrapper.cmake

* [freeimage] Prefer creating config.cmake instead of vcpkg-cmake-wrapper

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* [d3dx12] new port

* Apply suggestions from code review

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update portfile.cmake

Use the correct d3dx12.h that does not require the very latest Windows SDK

* Apply suggestions from code review

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/d3dx12/portfile.cmake

* [d3dx12] Download license file

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* Update CONTROL

* Update portfile.cmake

* Update add-project-declaration.patch
* [vcpkg docs] add docs for manifest files

These are just for the maintainer docs,
not user docs.

* [vcpkg] EBNF-ify platform expression parsing

this modifies nothing about what strings are accepted or rejected,
it just moves stuff around.

also adds tests.

* [vcpkg docs] add manifest mode example

* [wip] docs for augustin

also fix tabs

* [vcpkg manifest] switch to using maps for features

* Apply suggestions from code review

* un-experimentize format-manifest

* flesh out the user manifest mode docs

* CRs

* billy CRs

* final personal pass-thru
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
…re. (#13512)

Root cause:
In `ffmpeg/portfile.cmake`, `--target-os=win32` is applied to all arm or arm64 targets.
This is wrong.

Fix:
Only apply "--target-os=win32" if VCPKG_TARGET_IS_WINDOWS.

Verify:
Run `./vcpkg install ffmpeg` on arm64-linux host, make sure the generated libraries are *.a not *.lib.
* Added croncpp port

* Update croncpp for windows failure

* Update ports/croncpp/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/croncpp/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/croncpp/CONTROL

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/croncpp/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/croncpp/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/croncpp/portfile.cmake

Co-authored-by: Robert Kesterson <robert.d.kesterson@leidos.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* update to 3.6.1

* remove unneeded changes

* fix qt5-x11extras linux dependency

* add dependency for osx

* make requested changes

* change hash
* New Port : libigl-triangle

* Update ci.baseline.txt for libigl-triangle port

* Update ports/libigl-triangle/CONTROL

Unnecessary Port-Version

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/libigl-triangle/portfile.cmake

Unnecessary inclusion of vcpkg_common_functions

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/libigl-triangle/portfile.cmake

Use README from source as the copyright file

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Updates to libigl-translate port

* Update libigl-triangle port

* Update ports/libigl-triangle/CONTROL

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/libigl-triangle/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Make the header copy properly and add CMake targets

* Utilize original sources for triangle library and rename to triangle

* Build triangle executable and add it to tools

* Fix Linux build which requires linking to m library for math functions

* Update scripts/ci.baseline.txt

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Instead of defining INT_PTR, use uintptr_t from stdint.h
Also, define FLOAT and VOID in the header so the user of the library does not have to define them

* Make sure the port works and can be used

* Remove the use of the SINGLE define for switching the REAL define to be float or double. Also make the define for VOID be void rather than replacing all VOID with void in order to reduce the patch size.

Co-authored-by: Nathan Mercer <nmercer@intermap.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
* [dartsim] Add new port

* Update vcpkg.json

* Update vcpkg.json

* Update vcpkg.json
* [vcpkg-docs] Add docs/users/binarycaching.md

* [vcpkg] Address PR Comments

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* [google-cloud-cpp] Update to v1.18.0 release

* Update portfile.cmake

Add unsupported message

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Neumann-A and others added 29 commits October 6, 2020 14:39
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
* [trantor] Update to 1.0.0

* Update ports/trantor/CONTROL

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
* [jsoncpp] Update to latest revision

* Fix typo issue
* [log4cxx] Upgrade to newly released 0.11.0

* [log4cxx] 0.11.0 should build everywhere except uwp

* Changes suggested by @ras0219

* Prevent WIN32 libraries being used on linux

* Prevent WIN32 libraries being used on linux

* Prevent WIN32 libraries being used on linux

* Update ports/log4cxx/portfile.cmake

Co-authored-by: Stephen Webb <stephen.webb@sabreautonomous.com.au>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
Co-authored-by: wangli28 <wangli28@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [sdl2] Fix build when VCPKG_BUILD_TYPE is set to "release"

* Convert CONTROL file to manifest
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* [Many ports] Update to the latest version

* [rhash] Update ci.baseline.txt

* [update] Remove change of rhash

* [update] Revert ci.baseline.txt

* [update] Revert ci.baseline.txt

* [update] Remove change of poco and paho-mqtt

* [sqlpp11] Revert change

* [openblas] Fix uwp error

* Update CONTROL

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Cédric Tabin <cedric.tabin@gmail.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Nathan Mercer <nmercer@intermap.com>
Co-authored-by: wangli28 <wangli28@beyondsoft.com>
@longhuan2018 longhuan2018 merged commit 3823c53 into longhuan2018:master Oct 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.