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

Rebasing #2

Merged
merged 190 commits into from
Jul 17, 2020
Merged

Rebasing #2

merged 190 commits into from
Jul 17, 2020

Conversation

remz1337
Copy link
Owner

No description provided.

BillyONeal and others added 30 commits June 21, 2020 19:13
* [vcpkg] Refactor out abi_tags_from_pre_build_info()

* [vcpkg] Track Windows toolchain file in triplet hash

* [vcpkg] Improve error messages when constructing PreBuildInfo

* [vcpkg] Extract InstallPlanAction::BuildAbiInfo

* [vcpkg] Extract Build::EnvCache and private-impl VcpkgPaths

* [vcpkg] Enable compiler hash detection when binarycaching is enabled

* [vcpkg] Downgrade warning about missing ABI keys

When binarycaching is not enabled, this warning is spurious and provides no user value.

* [vcpkg] Cleanup

* [vcpkg] Refactor compiler tracking into triplet abi computation

Move several static global caches into VcpkgPaths/EnvCache.
Add feature flag 'compilertracking' to enable the new feature.

* [vcpkg] Refactor out PreBuildInfo::using_vcvars()

Move VcpkgTripletVar into build.cpp because it is not used outside that file.

* [vcpkg] Address some code analysis warnings

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

* [paraview] add new port

* [paraview] correct dependencies; disable catalyst

* [VTK/ParaView] Make ParaView build

* [paraview] add missing patch

* [paraview] add cgns patch

* [paraview] add qt plugin patches back in. Remove in the future

* [vtk] slightly improved patches

* [vtk] don't disable findPython

* [paraview] add more features

* [paraview] remove X11Extras from OSX

* [vtk] make vtk workcorrectly with python and prepare for paraview with python

* [paraview] Python fixes

* [paraview] small bin -> lib replacement fix for static builds

* [vtk] fix patch path

* update baseline to exclude paraview for the time being on osx and linux.
requires a fix in qt5-base linkage of libpq.

* [paraview]try setting LD_LIBRARY_PATH for unix systems

* [paraview] a bit of cleanup

* update baseline

* fix typo in baseline

* [paraview] remove unnecessary patch

* [vtk] replace custom patch with upstream patch

* [paraview] cleanup in the portfile.

* Update ports/paraview/CONTROL

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* [hdf5] Update HDF5 to 1.12 and use github live-clones instead of binary download

* [hdf5] bump control

* [hdf5] fix szip and typo about linkage

* [hdf5] add missing package namespace.... they somehow missed to set it?

* [hdf5] retry without "

* [field3d] fix regression and update. Remove windows as unsupported since the cmakelists tries to support windows

* fix typo

* remove ws

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

* linebreak first patch

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

* ws change

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

* [field3d] update copying installation

* [hdf5] use official github repo

* clean baseline

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* [absent] Bump version 0.3.1

* [absent] Update CONTROL

This patches updates the CONTROL file to the latest release 0.3.1,
as well as its description.
* fix windows-static for don't export symbols

/* export symbols by default, this is necessary for copy pasting the C and header file */
#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
#define CJSON_EXPORT_SYMBOLS
#endif

* Update CONTROL
* [Drogon] Add new port

* Update version

* Use cmake options instead of patching
* [LIBXDIFF] New port

* Remove not necessary installations

* Add Fail message to UWP

* Add UWP fail on baseline

* Revision fixes

* Update ports/libxdiff/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
…soft#12007)

* [openmesh] Fix *.dll export and add vcpkg-cmake-wrapper.cmake

* Update ports/openmesh/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* [activemq-cpp] Fix static build

* update baseline
…rosoft#11983)

* [libmicrohttpd] Support build on UNIX and use msbuild on Windows

* update baseline
* [llvm] fix issue microsoft#11916

* Remove include(vcpkg_common_functions)

Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
…1903)

* Delete the bin directory if the platform is Linux

* Update x265 to 3.2-4
* [efsw] Add new port

* Update portfile.cmake

* Remove unnecessary BUILD_SHARED_LIBS assigning

* Update portfile.cmake

* Update library

Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
* [icu] Add tools

* Add macro variables
* Add Bitmagic Port file

* Renamed to Bitmagic

* Added bitmagic portfile

* Added lower case to capital letter to match

* Edited path for header files

* Removed function vcpkg_configure_cmake()
ZeeWanderer and others added 29 commits July 13, 2020 12:30
- Fixes the following error:
  src/sljit/sljitConfigInternal.h:219:2: error:
  #error "-mshstk is needed to compile with -fcf-protection"
- Upstream bug report:
  https://bugs.exim.org/show_bug.cgi?id=2578
- Add patch based on upstream commit:
  https://vcs.pcre.org/pcre2?view=revision&revision=1256
- Fixes microsoft#12343
* upgrade openmesh to 8.1
Tested on Window 10 with Visual Studio 2019 x64

* update version for CONTROL file

* 1. Remove obsolete function `include(vcpkg_common_functions)`
2. Use `vcpkg_fixup_cmake_targets()`

* fix build error on Linux

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
…icrosoft#12254)

* [vcpkg] Track hashes of cmake script helpers in consuming portfiles

* [vcpkg] Format

* [vcpkg_find_acquire_program] Use �cpkg_from_sourceforge for FLEX and BISON

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
…lets (microsoft#12361)

* [vcpkg ios] Fix detection of iOS toolchain (microsoft#6003)

Added mapping of CMAKE_SYSTEM_NAME == iOS to the bundled iOS toolchain
file.

This fixes the "Unable to determine toolchain to use for
triplet arm64-ios with CMAKE_SYSTEM_NAME iOS" error.

* [vcpkg ios] Set the CMake system processor for the simulator arches (microsoft#6003)

So it's consistent for all architectures.
* [vcpkg] Initial commit of Binarycaching specification

* [vcpkg] Update to Binarycaching Specification

Note change to XDG directory structure.
Replace 'upload' config keyword with more flexible read/write/readwrite keywords.

* [vcpkg] Update binarycaching.md with new option

--write-nuget-packages-config
)

* [libb2] Add supports and install pkg-conifg on macOS VM

* Add blank line to the end of the json file

* vcpkg x-format-manifest --all

* Remove failed ports in ci baseline file
…icrosoft#12211)

* [magnum] Improve maintainability of feature to cmake flag conversion

* [magnum] Ignore features not supported on current platform

Allows `vcpkg install magnum[*]` on any platform.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Add cglcontext and windowlesscglapplication features

* docs: Update valid VCPKG_CMAKE_SYSTEM_NAME values

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Replace deprecated basisu with archive download

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Add meshoptimizersceneconverter feature

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Also use vcpkg_check_features

Analog to magnum port.

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06

Signed-off-by: Squareys <squareys@googlemail.com>

* [meshoptimizer] Add initial port

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Replace meshoptimizer download with feature dependency

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade,magnum-*] Fix license installation command

Signed-off-by: Squareys <squareys@googlemail.com>

* [meshoptimizer] Use vcpkg_fixup_cmake_targets

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* Upgrade geographiclib to version 1.50.1

* Tinker with sourceforge download

* Strip verbiage at top of geographiclib/portfile.cmake

* geographiclib: fix for windows build

* geographiclib: minimize size of patch file

* add missing manifest

* A stab at fixing uwp build error.  But I'm working in the dark!

* Back out of previous commit.  It didn't help.

* Call cmake_minimum_required first

* geographiclib: remove tools from build -- incompatible with uwp

* geographiclib: remove stray reference to TOOLS

* geographiclib: try installing executables into tools

* geographiclib: Do not build tools for uwp

* geographiclib: fix up build of tools

* geographiclib: Minor clean up

* geographiclib: handle uwp vs tools more elegantly

* geographiclib: reformation vcpkg,json

* geographiclib: don't build tools by default

* geographiclib: Don't register the tools as targets; this causes problems if they are moved

Co-authored-by: Charles Karney <charles.karney@sri.com>
* [vcpkg formatting] Turn off DeriveLineEnding

* format

* Add newlines to the end of files

Since we're reformatting anyways
* [zstd] add pkgconfig

* [zstd] correct debug link

* Update ports/zstd/CONTROL

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

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update to nrf-ble-driver-4.1.2

* Update source code hash

* Copy .hex/.zip files to package install directory
* [folly] Fix build error C3861

* Update CONTROL
* [boost-modular-build-helper] Remove has_icu.lib

* Add quotes
* [libpq] Remove broken features

* Update ports/libpq/portfile.cmake

Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* [liblzma] Update to v5.2.5

* [liblzma] Use WIN32 instead of MSVC

* [libvpx] Add mingw support

* Update portfile.cmake

* Update CONTROL

* Update CONTROL

Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
…crosoft#12400)

* [vcpkg] implement copy_symlink working for non-elevated processes

* [vcpkg] read_symlink Windows implementation

* [vcpkg] normalize_path on Windows only

* Update toolsrc/src/vcpkg/base/files.cpp

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update toolsrc/src/vcpkg/base/files.cpp

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update toolsrc/src/vcpkg/base/files.cpp

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* remove normalization

* Update toolsrc/src/vcpkg/base/files.cpp

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update toolsrc/src/vcpkg/base/files.cpp

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update toolsrc/src/vcpkg/base/files.cpp

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update toolsrc/src/vcpkg/base/files.cpp

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* Update toolsrc/src/vcpkg/base/files.cpp

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* use unique_ptr

* comments

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
- Add missing vcpkg_fixup_pkgconfig(), which was detected in
  microsoft#12151
- Fix debug POSTFIX in pugixml.pc file using
  pugixml-v1.10_fix_debug_pkgconfig.patch
  based on upstream: zeux/pugixml#363
  This results in the following contents of pugixml.pc:
  Release:
    Libs: -L${libdir} -lpugixml
  Debug:
    Libs: -L${libdir} -lpugixml_d
* [hiredis] Fix feature ssl build error on windows

* Fix feature example build error on windows
* [eigen3] Fix eigen3 and cuda compatibility issue

* forgot to apply patch

* Update ports/eigen3/portfile.cmake

* Update ports/eigen3/portfile.cmake
* [imgui] Split bindings to multiple features

See microsoft#12250.

I tested all the features on x86-windows, x64-windows, x64-windows-static and x64-linux triplets. Everything build fine except:
- dx12-binding on x86-windows. There's an issue opened about it here : ocornut/imgui#2406
- allegro5-binding on x64-linux, because the current allegro5 port fails to build on this platform.

Contrary to the previous port which simply copied the sources to a specific folder, bindings are now compiled with their dependencies. The only exception is Marmelade, because there's no port available for it yet.

Unfortunately, I can't test the OSX and metal bindings. If someone using this platform could test it, it would be very much appreciated. :)

* [imgui] Move port files to the correct folder

* Update ports/imgui/CONTROL

Co-authored-by: Rémy Tassoux <rt2@rasterizedworld.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* [libyuv] Fix static build issue

* Update the patch and replace the definition i headers file
* [vcpkg] Clean up command switch code

Make it more similar to the non-command switch code

* format

* fix the tests

* reformat

* format

* wip

* support x- for command options

* fix autocomplete

* format
* [zlib] Add pkgconfig file

Install the zlib.pc file, which is generated during the CMake build.
Fix the pkgconfig file under Windows, where the lib is called zlib
instead of libz and add the postfix 'd' in case of a Windows debug
build.

* Check VCPKG_BUILD_TYPE to handle release/debug

* Simplify check of VCPKG_BUILD_TYPE to handle release/debug

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

* Update PR according to review comments

- Remove include(vcpkg_common_functions)
- Comment out vcpkg_test_cmake(PACKAGE_NAME ZLIB MODULE)

* Update ports/zlib/portfile.cmake

* Update ports/zlib/CONTROL

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Sync master with original repo
@remz1337 remz1337 merged commit a2f8808 into xframe Jul 17, 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.