451 Commits

Author SHA1 Message Date
Jack·Boos·Yu
56174640c9
[vcpkg_build_qmake] Disable multi-threaded build when file fails to open (#12752)
* Disable multi-threaded build when file fails to open

* re-trigger qt5 test
2020-08-06 07:19:54 -07:00
Deadpikle
7b054d8d34
[vcpkg scripts] Add VCPKG_TARGET_IS_IOS (#12715) 2020-08-05 13:04:35 -07:00
Deadpikle
2ade39048c
[vcpkg] Fix prettify output not working in some cases (#12717)
If you changed VCPKG_TARGET_ARCHITECTURE to use x86_64, the prettify command failed to parse things properly. This was found during the changes made for #12657 and was completed by @strega-nil (thanks!).
2020-08-05 13:03:34 -07:00
Alexander Neumann
8e76503a76
[ITK] Update to 5.1 (#11208)
* [vtk-m] new port vtk-m

* [VTK] Update to 9.0

* include local buildtree changes

* [pcl] disable VTK due to API changes in VTK 9.0

* [vtk-m] add supports field to be only x64

* [vtk-dicom] add python executable.

* fix vtkm dependency

* [vtk-dicom] fix missing std:: namespace

* [vtk-m] add uwp to unsupported triplets

* [vtk] add pegtl include patch, reenable IOMotionFX

* remove hdf5 changes for testing

* use different pgetl patch which redirects to the installed config of pegtl

* [pegtl-2] version file needs renaming too

* [vtk] change dependency to pgetl-2 and fix the patch

* [vtk] put in hdf5 fix again and correct manually installed include files

* remove deprecated function to retrigger CI

* [lz4] correctly lowercase the lz4 config

* [vtk] remove unnecessary code

* [pegtl-2] add homepage

* [pegtl] modernize portfiles

* [vtk-dicom] add homepage

* [vtk-dicom] modernize portfile

* [vtk-m] remove empty build depends

* [vtk] try fixing the permission issue

* [vtk] minimal dependency correction

* [itk] update

* fix portfile errors

* WIP commit

* should make ITK green in VCPKG CI but there a still issues with features

* more dependencies and features....

* remove itk from baseline failure so the check can get green

* more dependency updating.

* minor build fixes

* [openjpeg] Fix dll location

* fix other issues

* add rtkcuda

* [openjpeg] remove default features to make arm and uwp platforms happy

* [itk] more dependency fixes

* [openjpeg] fix no tools case

* [itk] fix wip patch

* [itk] split up patches & cleanup & and move rtk tools if build

* [itk] fix patch and remove old and wip patch

* [nifticlib] Add new port required by minc

* [nifticlib] change repo and add features

* [nifticilib] add zlib dependency & cleanup

* [minc] add new port

* [vcpkg/scripts] add swig to find acquire programm

* [itk/minc] update for external minc

* add supports field for nifticlib

* [itk] make python a default feature for testing

* [itk] cleanup python vars a bit
[vcpkg/scripts] correct swig hash

* [vcpkg/scripts] fix swig

* [itk] fix python include path on unix system

* [itk] remove python as a default. A bit of feature cleanup

* [itk] update remote RTK

* [itk|rtk] remove RTK module before configure to allow patching

* [opencl] update opencl wrapper

* [itk] fix opencl static linkage

* [itk] add cufftw fix

* update baseline

* [itk] fix itk[tbb]

* [itk] update python paths to 3.8

* [itk] add failure messages for unsupported architectures for some features

* [vcpkg_find_acquire_program] update swig to 4.0.2

* Update portfile.cmake

* [itk] move the module removal out of the if for people reusing the old source tree

* [itk] add missing auto_clean to vcpkg_copy_tools

* Update ports/nifticlib/CONTROL

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

* Update ports/openjpeg/portfile.cmake

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

* Update scripts/cmake/vcpkg_find_acquire_program.cmake

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

* [openjpeg] pass OPTIONS to vcpkg_configure_cmake

* [itk] fix typo and leave a todo.

* use sourceforge args for swig

* Update ports/openjpeg/CONTROL

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

* Update ports/opencl/CONTROL

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

* [itk] remove debug msgs from patch

* pre-install yasm on OSX

Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2020-08-02 15:49:20 -07:00
Silvio Traversaro
00e44369cb
[tomlplusplus] Add new port (#10786)
* vcpkg_fixup_cmake_targets: Add support for processing cmake config files generated by meson

In particular this adds a workaround for the differences between CMake and meson
described in https://github.com/mesonbuild/meson/issues/6955

* Add tomlplusplus

* Resolve conflicts

* Update scripts/ci.baseline.txt

* [tomplusplus] Update ci.basline.txt

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: wangli28 <wangli28@beyondsoft.com>
Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
2020-07-31 16:49:53 -07:00
Todor Prokopov
e2cdd07866
[vcpkg] Fix vcpkg_fixup_cmake_targets to work correctly on MinGW (#12104)
* [vcpkg] Fix vcpkg_fixup_cmake_targets to work correctly on MinGW

* [akali] Bump version to test vcpkg_fixup_cmake_targets changes

* Update ports/akali/CONTROL

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-07-31 11:13:45 -07:00
Alexander Neumann
e299457351
[vcpkg_fixup_pkgconfig] Remove required in first find_program call for pkg-config (#12569)
* Remove required in first find_program call

* add usr/local/bin for mac

* lets try without cellar and see if osx ci agrees
2020-07-31 09:20:56 -07:00
Jack·Boos·Yu
2b8d5bad0a
[qt5 components] Disable parallel build (#12529)
* [qt5-imageformats] Disable parallel build

* [ompl] Disable parallel configure

* [qt5-connectivity] Disable parallel build

* [qwt] Update hash

* [qt5-location] Disable parallel build

* Update ports/qwt/portfile.cmake

* Update ports/qwt/portfile.cmake

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

* [qt5] change build method to vcpkg_execute_build_process

* Add condition when there are some file conflicts

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-07-31 09:12:17 -07:00
Ramadan Ahmed Ramadan
b840d03c5b
fix issue #9228 : Add support to subgroups in gitlab (#9248)
* fix issue #9228 : Add support to subgroups in gitlab

* Update vcpkg_from_gitlab.cmake

* Update vcpkg_from_gitlab.cmake
2020-07-30 15:10:26 -07:00
emptyVoid
25412e1f46
[vcpkg-acquire-msys] Install new keyring (#12467) 2020-07-28 12:04:53 -07:00
Stefano Sinigardi
f1e7a3f167
[opencv4] update to v4.3 (#11130)
* [opencv4] draft update to v4.3

* restore uwp patch

* fix qt and ipp features

* fix libepoxy and meson on osx

* fix baseline, trigger a full rebuild due to meson tool changes

* remove jpeg feature on windows due to a bug with MSVC

* minor fixes for some features

* ffmpeg x11 lib not required anymore on apple for downstream projects

* small fixes for ogre and qt5

* remove a broken module

* fix installation path

* fix openexr which was broken and regressed opencv downstream projects

* first round of ci passes

* improve compatibility with android toolchain

* [openexr] upgrade to v2.5.0 to fix regressions, might require fixes in dependent projects and might deserve its own PR

* fix OpenEXR link for downstream projects

* do not install unrequested features

* fix compatibility with newer OpenEXR

* [OpenCV3] update to v3.4.10

* fix openexr on windows, was creating symlinks that broke vcpkg

* fix openexr wrapper

* [openexr] cmake config files are installed into a lowered-case folder

* remove mangled paths trying to fix android setup

* disable dnn on android, fix mangled cmake config paths again

* fix downstream CUDA dependency

* fix compatibility with vs16.6

* remove from baseline ports now passing tests

* [alembic] fixes for new openexr

* fix baseline

* [field3d] fixes for new openexr

* [field3d] improve fixes, windows still unsupported despite what is said upstream

* apply fixes required from review

* add missing field3d patch

* [field3d] disable mpi integration

* [opencv2] remove cublas integration

* [vtk] do not create libharu::libharu target if already existing

* Update ports/opencv4/portfile.cmake

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

* Update ports/opencv3/portfile.cmake

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

* improve compatibility with newer CUDNN

* [OpenCV3, OpenCV4] improve compatibility with CUDA 11

* [OpenCV2] improve compatibility with CUDA 11

* [field3d] regenerate patch ignoring space at eol

* [vcpkg] Use SSH keys instead of password authentication when minting Linux scale sets (#11999)

* [field3d] regenerate patch ignoring space at eol

* [field3d] regenerate patch, again

* [field3d] fixes for windows

* [libass] fix regression

* ci.baseline.txt update

* [CUDA11] use FindCUDA from CMake 3.18 to ease transition later

* re-bump vtk and ffmpeg, which were lost with merges from master

* [OpenCV4] Halide feature is not broken anymore

* [field3d] regenerate hdf5 patch

* [OpenCV4] remove GTK features: it can be built only on *nix but GTK on vcpkg cannot be built on *nix systems...

* merge ci.baseline.txt from master and fix field3d patch

* remove rebuilding

* restore vtk CONTROL file

* update CONTROL files

* Trigger rebuild

* Update ports/freeimage/CONTROL

* Update ports/freeimage/CONTROL

* [opencv3/4] avoid tesseract dependency on uwp builds

* [opencv] add missing module search

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-07-27 17:43:23 -07:00
Alexander Neumann
458c20e94b
[vcpkg/scripts/pkgconfig] rewrite pkg-config check for libraries (#11550)
* [vcpkg/scripts/pkgconfig] rewrite pkgconfig check for libraries.

* [vcpkg/scripts/pkgconfig] fix more details.

* [vcpkg/scripts/pkgconfig] smaller improvements

* ws change to check functionallity of script for testing.

* [vcpkg/scripts/pkgconfig] update to latest test version

* Revert "ws change to check functionallity of script for testing."

This reverts commit 26269e9e776009230777d9390465715f2ebac465.

* [nettle] bump control for vcpkg_fixup_pkgconfig test

* [gmp] rerun CI to create new *.pc files

* [gmp/nettle] enable port debug

* [vcpkg/script/pkgconfig] fix path conversion regex for CI

* [CI|OSX] install pkg-config on osx

* [gmp/nettle] disable port debug

* [vcpkg/scripts/pkgconfig] update to latest version of x windows pr

* [zlib] add pkgconfig file

* [zstd] add fixup pkgconfig

* [libpng] add pc file installation

* [bzip2] install pc file and leave a TODO for somebody else ;)

* [bzip2] bump control

* [vcpkg/scripts/pkgconfig] skip checks if pkgconfig cannot be found.
- small bugfix in ignore flags regex

* retry zstd and zlib

* [libpng] retry by adding dl and m to system libraries for osx

* [libpng] add missing vcpkg_fixup_pkgconfig()

* [vcpkg/scripts/pkgconfig] unset var if found. 

fixes checks for other configurations which will be always succesful otherwise

* [libpng] bump control

* [libpng] enable port debug to debug osx regression

* ws change to retrigger osx ci and hopeing that it works

* fix typo

* [libpng] remove -lm flag on apple platforms

* ws change to rerun some ports in ci for good measure after the merge with master

* Re-trigger CI test

* [zstd] add pkgconfig

* [zstd] correct debug link

* [vcpkg/script/pkgconfig] - add more search suffixes for static libs
- add additional debug messages for debuging
- fix unsetting of cache variables hiding issues with debug libraries
- fixed pkgconfig fix in the debug case

* [pcre] add pthread dependency to pcre

* [protobuf] fix pkgconfig

* include quotes around the prefix in the case the prefix path was quoted (fixes some regressions)
add option NOT_STATIC_PKGCONFIG to run pkg-config without the --static argument

* [ignition-msgs5] get rid of a dev warning

* [apr] fix apr regression

* [protobuf] fix protobuf regression

* [sdl1] fix regression due to variable expansion of pkg-config. Use similar regex to the library removal for ignored flags.

* [ignition] fix regression

* remove changes of zlib portfile.

* reset changes in osx ci pipeline

* add DISABLE_PARALLEL_CONFIGURE

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
2020-07-24 11:39:21 -07:00
Kevin Lu
85a5acfd3c
[vcpkg_configure_make] typo fix '_vcpkg_append_to_configure_environment' (#12432) 2020-07-15 15:23:40 -07:00
ras0219
385fb52332
[vcpkg] Track hashes of cmake script helpers in consuming portfiles (#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>
2020-07-13 13:43:39 -07:00
ras0219
18c7750270
[vcpkg] Improve informational message for --editable while cleaning sources (#12366)
* [vcpkg] Improve informational message for --editable while cleaning sources

* [vcpkg] Update scripts/cmake/vcpkg_extract_source_archive_ex.cmake

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

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2020-07-13 12:12:48 -07:00
ras0219
f9bdf13953
[vcpkg] Implement --editable (#12200)
--editable suppresses binary caching and source re-extraction for packages listed on the command line (similar to --head).

This fundamentally changes the port maintenance loop, so several example documents were updated. To avoid users having substantial changes suddenly destroyed by forgetting to pass --editable, "clean" sources have different extract locations.

The undocumented command `build` implies `--editable`.

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-07-07 13:53:19 -07:00
Long Nguyen
89dec24cc2
[vcpkg] Add mingw dynamic libs triplet (#12101)
* Update .gitignore

* Add mingw dynamic lib triplets

* Only copy pdbs if not using *-mingw triplets

* Using VCPKG_POLICY_DLLS_WITHOUT_LIBS as a workaround

* Rename *-mingw to *-mingw-dynamic

Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
2020-07-06 14:20:06 -07:00
Billy O'Neal
8eda81cc4d
[opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths. (#12232)
Also delete vcpkg_get_program_files_32_bit because it was used in only one place.

Resolves #8288
Obsoletes #11421, #11261, #8329
2020-07-06 12:42:35 -07:00
Jack·Boos·Yu
21b56d9929
[vcpkg_from_sourceforge] Add retry mirror function (2/2) (#12018) 2020-07-03 09:36:40 -07:00
ras0219
3f6342db6d
[vcpkg] Fix vcpkg export --nuget regressions (#12174)
* [vcpkg] Upgrade find_acquire_program(NUGET) to 5.5.1. Add partial SHA to temporary download paths to avoid collisions.

* [vcpkg] Fix regression in `vcpkg export --nuget` due to file locking on .vcpkg-root

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-06-30 14:02:26 -07:00
nicole mazzuca
1d8f0acc9c
[vcpkg manifest] Manifest Implementation (#11757)
==== Changes Related to manifests ====

* Add the `manifests` feature flag
  * This only says whether we look for a `vcpkg.json` in the cwd, not
    whether we support parsing manifests (for ports, for example)
* Changes to the manifests RFC
  * `"authors"` -> `"maintainers"`
  * `--x-classic-mode` -> `-manifests` \in `vcpkg_feature_flags`
  * reserve `"core"` in addition to `"default"`, since that's already
    reserved for features
  * Add a small helper note about what identifiers must look like
  * `<license-string>`: SPDX v3.8 -> v3.9
  * `"feature"."description"` is allowed to be an array of strings as well
  * `"version"` -> `"version-string"` for forward-compat with versions
    RFC
* Add the `--feature-flags` option
* Add the ability to turn off feature flags via passing
  `-<feature-flag>` to `VCPKG_FEATURE_FLAGS` or `--feature-flags`
* Add CMake toolchain support for manifests
  * Requires either:
    * a feature flag of `manifests` in either `Env{VCPKG_FEATURE_FLAGS}`
      or `VCPKG_FEATURE_FLAGS`
    * Passing the `VCPKG_ENABLE_MANIFESTS` option
  * The toolchain will install your packages to
    `${VCPKG_MANIFEST_DIR}/vcpkg_installed`.
* Add MSBuild `vcpkg integrate install` support for manifests
  * Requires `VcpkgEnableManifest` to be true
* `vcpkg create` creates a port that has a `vcpkg.json` instead of a
  `CONTROL`
* argparse, abseil, 3fd, and avisynthplus ports switched to manifest
  from CONTROL
* Add support for `--x-manifest-root`, as well as code for finding it if
  not passed
* Add support for parsing manifests!
* Add a filesystem lock!

==== Important Changes which are somewhat unrelated to manifests ====

* Rename `logicexpression.{h,cpp}` to `platform-expression.{h,cpp}`
* Add `PlatformExpression` type which takes the place of the old logic
  expression
  * Split the parsing of platform expressions from checking whether
    they're true or not
  * Eagerly parse PlatformExpressions as opposed to leaving them as
    strings
* Add checking for feature flag consistency
  * i.e., if `-binarycaching` is passed, you shouldn't be passing
    `--binarysource`
* Add the `Json::Reader` type which, with the help of user-defined
  visitors, converts JSON to your internal type
* VcpkgArgParser: place the switch names into a constant as opposed to
  using magic constants
  * In general update the parsing code so that this ^ works
* Add `Port-Version` fields to CONTROL files
  * This replaces the existing practice of
    `Version: <my-version>-<port-version>`

==== Smaller changes ====
* small drive-by cleanups to some CMake
  * `${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}` ->
    `${CURRENT_INSTALLED_DIR}`
  * Remove `-analyze` when compiling with clang-cl, since that's not a
    supported flag (vcpkg's build system)
  * Add a message about which compiler is detected by vcpkg's build
    system machinery
* Fix `Expected::then`
* Convert `""` to `{}` for `std::string` and `fs::path`, to avoid a
  `strlen` (additionally, `.empty()` instead of `== ""`, and `.clear()`)
* Add `Strings::strto` which converts strings to numeric types
* Support built-in arrays and `StringView` for `Strings::join`
* Add `operator<` and friends to `StringView`
* Add `substr` to `StringView`
* SourceParagraphParser gets some new errors
2020-06-30 10:40:18 -07:00
freddy77
a0bd59c6a2
Fix typo in comment (#12069)
Enabel -> Enable

Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
2020-06-26 19:22:12 -07:00
Jack·Boos·Yu
a0e0c57f86
[vcpkg] Add vcpkg_from_sourceforge (1/2) (#11899) 2020-06-26 15:06:30 -07:00
Silvio Traversaro
70ab27fcad
[ignition-plugin1] Add new port 🤖 (#11275)
* [ignition-plugin1] Add new port

* vcpkg_fixup_cmake_targets: Add DO_NOT_DELETE_PARENT_CONFIG_PATH

By default the vcpkg_fixup_cmake_targets script remove the parent
path of CONFIG_PATH if it named "cmake", this behaviour is not convenient
for ports that install more than one CMake package config file, and
for which vcpkg_fixup_cmake_targets is invoked multiple times.
To optionally disable this behaviour, this commit adds the option
DO_NOT_DELETE_PARENT_CONFIG_PATH to vcpkg_fixup_cmake_targets.

* [ignition-modularscripts] Add support for ignition libraries that install multiple CMake package config files

Some ignition libraries install several CMake  package config files,
to represent the different components of the library. This  commit modifies
the ignition_modular_library function to fixup correctly all the cmake package config files.

* vcpkg_fixup_pkgconfig: Move definition of SYSTEM_LIBRARIES to vcpkg_common_definitions

To correctly validate installed pkg-config files, vcpkg_fixup_pkgconfig needs to know
for each platform which libraries are not managed by vcpkg. This commits improve this
definitions for all the triplet supported by vcpkg, and move this definition to vcpkg_common_definitions
in a way that permit custom triplets to overload its value.
2020-06-24 14:59:32 -07:00
Vicki Pfau
eede79eb27
Fix bootstrapping MSYS2 pacman (#11499) (#12080) 2020-06-24 11:29:28 -07:00
Vitalii Koshura
61c2158d33
[cmake] Add mirror to download Strawberry Perl (#11938)
Last several days Strawberry Perl official download server has issues that lead to extremely slow download rates
(sometimes it takes more than 1 hour to download ~150MB).
This commit adds non-official mirror of Strawberry Perl to the list of available URLs.

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
2020-06-18 15:42:20 -07:00
Jack·Boos·Yu
f18e0b4387
[thrift] Update to 0.13.0 and fix OSX build (#11981) 2020-06-17 13:42:40 -07:00
Adam Johnson
e1783c68c4
[python3] Update to Python 3.8 (#11708)
* [python3] Update to Python 3.8.3.

[vtk] Update to Python 3.8 and fix improper Python3 artifact
specification.

* [python3] Fix static linking, broken in 121faf2.

* [hyperscan] Add missing build dependency (fixes CI on macOS).
2020-06-11 22:23:26 -07:00
emptyVoid
a5e28c4b35
[vcpkg-acquire-msys] Improvement (#11810)
* [vcpkg-acquire-msys] Remove obsolete workaround.

* [vcpkg-acquire-msys] Don't refresh package database on package install.

* [vcpkg-acquire-msys] Drop no longer needed taskkill.

* Trigger CI rebuild to test vcpkg_acquire_msys.
2020-06-11 02:09:19 -07:00
Billy O'Neal
4fb2256085
[vcpkg] Allow CI to pass in all relevant directories and remove use of symbolic links (#11483) 2020-06-03 19:31:28 -07:00
emptyVoid
e792d1c171
[vcpkg-acquire-msys] Update pacman before any other package. (#11443)
* [vcpkg-acquire-msys] Update pacman manually to work around update issues.
2020-05-22 00:58:05 -07:00
Alexander Neumann
27c6c94202
[vcpkg] Improve make builds (#10402)
* update all 16 configure_make ports

* add make wrappers for msvc

* improve make builds

* fix relativ path errors on linux (and osx?)

* revisit all 16 portfiles again

* remove trace from install

* fix relative build path issues.

* bump control of the 16 configure ports

* never forget .... real linux is case sensitive ....

* Revert "bump control of the 16 configure ports"

This reverts commit 40d6d81c01d2709c4acbdbec503b4787c3fd8282.

* Revert "Revert "bump control of the 16 configure ports""

This reverts commit 9c9851ddfcd01bfad604ab9c9aed7379238d619a.

* bump control again for real ci rebuild

* add copy_source

* remove message

* pass parameters to vcpkg_build_make

* fix healpix build.

* fix libmagic regression

* fix libwandio regression

* pfring changes regression fix? (cannot test in wsl)

* ws change to retrigger CI

* fix libpq regression

* fix libudns regression

* add share/pkgconfig to PKG_CONFIG_PATH

* cleanup of deprecated options

* cleanup docs

* Revert "bump control again for real ci rebuild"

This reverts commit b4bc18edc2376eba6c3aa3dda52bd82286f23616.

* shared binaries on linux should stay in lib. Only dlls are mvoed to bin

* move pkgconfig check and add message about missing system packages

* added autopoint as a build requirement

* fix prerun shell working dir.

* a few fixes from the x windows pr
- add libpath setting
- fixed pkgconfig search on windows platforms
- fixed autopoint msys package on windows

* fix release prefix

* minimal cleanup and ws changes to trigger true CI rebuild

* fix tcl by upgrading

* remove unnecessary rename

* fix pfring? can't test in WSL. Linux kernel headers required.

* fix lowercase in patch

* fix libwandio

* remove x264 from fail list

* replace wrappers with wrappers from automake

* update make ports

* remove unnecessary message

* refactor vcpkg_configure_make

* [tcl] remove stray ?

* [farmhash] fix build

* [freexl] ws change to retrigger ci build

* [x264] add pthread as a dependency

* [vcpkg/scripts] add ignore flag correctly

* [sdl] fix vcpkg_fixup_pkgconfig call

* [farmhash/freexl] delete configure and recreate it.

* [libudns] remove trailing ?

* [freexl] use empty build target

* [freexl] add system library; remove previous change

* Update ports/x264/portfile.cmake

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

* [libwandio] remove unncessary comment

Co-authored-by: dan-shaw <51385773+dan-shaw@users.noreply.github.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-05-21 10:46:07 -07:00
Wolfgang Stöggl
a29e5b6d5d
[tool-meson] Update to 0.54.2 (#11380)
* [tool-meson] Update to 0.54.2

- Release notes: https://mesonbuild.com/Release-notes-for-0-54-0.html
- Homepage added to CONTROL file

* Re-trigger CI test

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2020-05-20 10:10:59 -07:00
Martin Vejdarski
ec2b59b93e
[harfbuzz,skia] Update and replace Skia dependencies with vcpkg (#11416) 2020-05-19 15:20:18 -07:00
Martin Vejdarski
6d5a1a897e
[gn, crashpad] Add GN build support and crashpad port (#10505)
* [vcpkg_find_acquire_program] Add gn

* [GN] Add build system support

* [crashpad] Add new port
2020-05-11 14:58:12 -07:00
Alexander Neumann
18ab20050c
[gmp,nettle,hogweed] Add new ports (#10613)
* add new function vcpkg_fixup_pkgconfig

* make message with changed files a debug_message

* add two more cases to the debug *.pc files

* comment out prefix.
use --define-variable=prefix=INSTALL_PATH

* changed the comment header.

* add missing word

* finish vcpkg_fixup_pkgconfig.cmake

* Update vcpkg_fixup_pkgconfig.cmake

Note: since CMake is run in script mode the description of VCPKG_FIXUP_PKGCONFIG_CALLED cannot be viewed

* transfer changes from x windows pr

* fix typo in regex

* add port for vs yasm integration within VCPKG

* add gmp

* add nettle

* add missing windows flag in control

* CI workaround
CI seems to not pass env YASMPATH correctly to cl.
Since YASM is on PATH -> remove $(VCInstallDir) as the default for YasmPath

* overwrite correct import.

* If CI does not give logs just display some extra info

* target replacement was mising

* apply same replacements for nettle

* remove unnecessary status message

* remove unnecessary platform code

* update supports field for vs-yasm

* apply replacement also to libhogweed

* fix static builds

* remove not working code

* remove debug/release options

* add additional replacement for the case the SOURCE dir has already been patched within VCPKG

* add triplet selection to vcpkg_install_msbuild

* fix missing ; in patches

* remove gmp dependency in static builds since they are not required

* cleanup portfiles

* add missing vcpkg_fixup_pkgconfig() call
2020-05-08 13:55:11 -07:00
Alexander Neumann
0bbf4400e9
[vcpkg/scripts] Fix ninja search path on windows and find binaries within vcpkg first (#11105)
* [vcpkg/scripts] fix wrong paths variable on windows

* [vcpkg/scripts] search within vcpkg first and then ask the rest of the world

* [vcpkg/scripts] add second search path for ninja.
First is for vcpkg fetch ninja
Second is for vcpkg_find_acquire_program
2020-05-06 13:52:51 -07:00
Billy O'Neal
7db401cb1e
[qt5] Add -j to make to parallelize on Linux and MacOS (#11111) 2020-05-04 15:37:57 -07:00
myd7349
0ab1a9e1c6
[vcpkg] Add new function vcpkg_copy_tools (#8749)
* [vcpkg] Add new function vcpkg_copy_tools

* [cpuinfo][czmq][nanomsg][uriparser] Use vcpkg_copy_tools

* [czmq] Clean even tools are not copied

[libsvm][zyre] Use vcpkg_copy_tools

* [vcpkg-copy-tools] Clean debug/bin

This should fix czmq build error

* [czmq] czmq does not have BUILD_TOOLS option

* [vcpkg] Split clean logic into another function

* [cpuinfo][czmq][nanomsg][uriparser] Fix calling of vcpkg_copy_tools

* [zyre] Fix regression error

* [vcpkg] Update try_remove_empty_directory

* [libsvm] Fix vcpkg_copy_tools call
2020-05-01 15:28:55 -07:00
Voskrese
b8c5ede662
[msbuild] Hotfix /p:UseEnv=True to be a port-local setting (#11058)
* Update vcpkg_build_msbuild.cmake

* Update vcpkg_install_msbuild.cmake

* Update CONTROL

* Update CONTROL

* Update portfile.cmake

* Update portfile.cmake

* Update ci.baseline.txt
2020-04-30 10:11:20 -07:00
Alexander Neumann
d054476e04
[vcpkg_acquire_msys] Fix undefined working dir. (#11102) 2020-04-30 09:50:29 -07:00
Alexander Neumann
c444db5f5a
[scripts] add new function vcpkg_fixup_pkgconfig (#9861)
* add new function vcpkg_fixup_pkgconfig

* make message with changed files a debug_message

* add two more cases to the debug *.pc files

* comment out prefix.
use --define-variable=prefix=INSTALL_PATH

* changed the comment header.

* add missing word

* finish vcpkg_fixup_pkgconfig.cmake

* Update vcpkg_fixup_pkgconfig.cmake

Note: since CMake is run in script mode the description of VCPKG_FIXUP_PKGCONFIG_CALLED cannot be viewed

* transfer changes from x windows pr

* fix typo in regex

* make the regex comment aware
make pc files relocatable by using ${pcfiledir} in prefix
tested with x window pr
2020-04-27 17:37:55 -07:00
Voskrese
ed9511fcf6
[libvpx][mpg123] Fix use of YASM in MSBuild (via path) (#10952)
* Update vcpkg_build_msbuild.cmake

* Update vcpkg_install_msbuild.cmake

* Update portfile.cmake

* Update CONTROL

* Update portfile.cmake

* Update CONTROL

* Update ci.baseline.txt.

* Update ci.baseline.txt

* Update ci.baseline.txt

* Update ci.baseline.txt

* Update portfile.cmake

* Update CONTROL

* Update CONTROL

* Update portfile.cmake

* [mpg123][libvpx] UWP is a target

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-04-23 21:18:56 -07:00
Cheney Wang
b6cd6ca0ba
[vcpkg] Update git to 2.26.2 (#10932)
* Update git to 2.26.1

* [vcpkg] Update git to 2.26.2

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
2020-04-23 13:47:47 -07:00
Robert Schumacher
2070c3c0d8
[ninja] Merge pull request #10796 from Voskrese/ninja-update-1.10
[Ninja] Update to 1.10
2020-04-16 12:23:19 -07:00
alcroito
c5f01e1dee
Add initial iOS support (#6275)
* Add iOS community triplets and toolchain support

Added an iOS toolchain to enable building packages for iOS.
The toolchain is used when a triplet's VCPKG_CMAKE_SYSTEM_NAME is set
to iOS.

To configure which architecture should be built, as well as other
iOS specifics, the following triplet variables can be set:
- VCPKG_TARGET_ARCHITECTURE
- VCPKG_OSX_SYSROOT
- VCPKG_OSX_DEPLOYMENT_TARGET
- VCPKG_OSX_ARCHITECTURES

The following VCPKG_TARGET_ARCHITECTURE values are currently
supported:
 - arm, arm64, x64, x86.

The following VCPKG_OSX_SYSROOT values are currently supported:
 - iphoneos, iphonesimulator, or an absolute path to the device or
   simulator Xcode SDK.

VCPKG_OSX_DEPLOYMENT_TARGET can be set to control the minimum iOS
delopyment target for the built libraries.

CMAKE_OSX_ARCHITECTURES is derived from VCPKG_TARGET_ARCHITECTURE,
so generally it should not be set. In case if someone needs to target
a more specific architecture (like armv7k or arm64e), it can
be set in the triplet via VCPKG_OSX_ARCHITECTURES.

Note that only certain combinations of the architecture and sysroot
will work: simulator SDKs only provide x86-based libraries, etc.

The toolchain also sets CMAKE_SYSTEM_PROCESSOR for certain
configurations, because certain packages (like libpng) depend on the
processor type.

Added 4 community iOS triplets that build static libraries:
- arm-ios, arm64-ios, x86-ios, x64-ios.
The non-arm triplets target the iOS simulator.

The triplets build static libraries because they are easiest to
integrate into an iOS project. Dynamic libraries or frameworks require
code signing on iOS, which complicates integration.

Added heuristics to try and automatically detect what iOS triplet to
use when building your own CMake project (so when a CMake project sets
CMAKE_TOOLCHAIN_FILE to buildsystems/vcpkg.cmake), if no explicit
triplet is provided (VCPKG_TARGET_TRIPLET is undefined).

The heuristic checks for the values of CMAKE_SYSTEM_NAME and
CMAKE_OSX_ARCHITECTURES. Note that for this to work,
CMAKE_OSX_ARCHITECTURES needs to be set before the first project()
call in your CMake project.

Added workaround so find_package finds vcpkg installed packages
when targeting iOS.
This is done by saving / restoring the value of CMAKE_FIND_ROOT_PATH
while also adding the vcpkg package root in the find_package override
macro.
The workaround can be removed once vcpkg upgrades to CMake 3.15.0
or higher where the issue is fixed.

Fixes: #6003

* Fix building libpng and pcre2 targetting iOS

Fixes: #6003
2020-04-15 13:06:55 -07:00
Voskrese
33a53a8ad0
ninja update 1.10 2020-04-12 12:47:40 +08:00
Alexander Neumann
bf858077f2
fix vcpkg_find_acquire_program for script (#10621)
behavior before:
one script found meant another script could not be searched since the first one would simply be returned.
2020-04-09 17:01:48 -07:00
Lily
6c4e822611
[vcpkg] Fix vcpkgTools.xml, vcpkg_find_acquire_program.cmake version/filename inconsistent (#10655) 2020-04-06 15:24:17 -07:00
Alexander Neumann
bd0c7106f9
[vcpkg] Make configure meson sane and work for all targets. (#10395)
* fix configure meson for non windows builds.

* change to the two ports using meson

* fix passing of empty compiler arguments.

* dont transform / into - for all flags

* copy meson logs into the buildtree to better diagnose CI errors of meson ports

* another change to the two ports to actually force a CI rebuild

* add missing /pkgconfig dir to PKG_CONFIG_PATH

* fix pkgconfig setup

* add share/pkgconfig to PKG_CONFIG_PATH

* Add CMake path to PATH for meson

* add share folder to prefix for meson

* remove double message

* add libdir so that meson does not install into architecture folder in linux
and make prefix path target dependent. (Or should it be host dependent?)

* bump controls

* update toolchain selector to use VCPKG_TARGET_IS_<paltform>.

* change pkgconfig prefix and path.....
meson is not correctly handling native windows paths and eating "\"
PKG_CONFIG_PATH also nees : to correctly separate paths
Prefix still must be near to native path but with / instead of \ C:/somepath/
2020-04-06 14:43:16 -07:00