Commit Graph

703 Commits

Author SHA1 Message Date
Kai Pastor
7e3dcf74e3
Fix vcpkg_host_path and its unit test (#24808)
* Fix vcpkg_host_path unit test

* Fix unit test variable control

* Enable all test features by default

* Fix recognition of PREPEND

* CMake doesn't set env vars to empty value

* Remove pointless STATUS message
2022-05-19 19:47:05 -07:00
Alexander Neumann
7ca918af71
dont change line endings on download (#24785) 2022-05-19 14:15:47 -07:00
Robert Kearns
e50057d13f
Exclude .DS_Store, fixing #24700 (#24701) 2022-05-16 12:40:11 -07:00
Jack·Boos·Yu
0d7603c4ef
[vcpkg_setup_pkgconfig_path] Add new functions to set or restore pkgconfig related environment variables (#23429)
* [vcpkg_configure_meson] Fix append host path

* New functions vcpkg_setup_pkgconfig_path and vcpkg_restore_pkgconfig_path

* Fix bug, add cos

* Apply suggestions

* Apply suggestions

* Apply suggestion

* doc

* Update docs/maintainers/vcpkg_setup_pkgconfig_path.cmake.md

Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>

* Update scripts/cmake/vcpkg_setup_pkgconfig_path.cmake

Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>

* Update scripts/cmake/vcpkg_configure_make.cmake

* Apply suggestions

* Apply suggestion

* Apply suggestions

Co-authored-by: Victor Romero <viromer@microsoft.com>
Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
2022-05-09 17:23:32 -07:00
Alexander Neumann
f7866c66d2
[vcpkg-cmake|cmake buildsystem] synchronize and sanitize scripts. (#23259)
* synchronize cmake build scripts.

* version stuff

* fix REMOVE_ITEM and add license

* format manifest

* update version

* use LOGFILE_BASE

* version update

* readd PREFER_NINJA and print a warning that it is deprecated for vcpkg_cmake_configure

* version stuff

* sync build_cmake

* only turn off ninja on windows

* add Z_VCPKG_CHAINLOAD_TOOLCHAIN_FILE

* use z_vcpkg_select_default_vcpkg_chainload_toolchain in meson

* remove VCPKG_CMAKE_GENERATOR

* version stuff

* reduce error to warning

* remove VCPKG_CMAKE_GENERATOR form configure_cmake

* version stuff

* version stuff

* use build_dir_<config>

* version stuff

* use ninja variable insead of pure ninja cmd

* version bump

* use ninja variable instead of calling ninja directly

* acquire ninja

* move the acquire.

* remove setting of cmake_prefix_path

* version stuff

* bump version date

* version stuff

* bump ashes baseline

* remove VCPKG_CMAKE_GENERATOR reference

* fix wrong variable reference due to refactor

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
2022-05-06 15:12:11 -07:00
Alexander Neumann
05c93c5c5a
[Fix uwp toolchain|world rebuild] make ninja work for uwp (#22831) 2022-04-27 18:12:48 -07:00
Benjamin Oldenburg
ce910bb87b
[skia,crashpad,zeroc-ice,vcpkg-tool-gn] New vcpkg-tool-gn and update of several ports (#24066) 2022-04-25 15:39:10 -07:00
Alexander Neumann
c556911a79
[vcpkg] Refactor toolchain & generator selection (#23846)
* put default generator and toolchain selection into a function

* update version-date of script

* version stuff

* restore PREFER_NINJA behavior on windows
use elseif instead of else

* cr ws change

* missing ,

* version stuff

* CR scripts/cmake/vcpkg_configure_cmake.cmake

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

* CR changes

* revert baseline

* update version

* bump version

* version stuff

* ci retrigger

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2022-04-11 15:57:36 -07:00
nicole mazzuca
7dd2e65c0b
[scripts-audit] minor vcpkg_from_* fixes (#19657)
* [scripts-audit] minor vcpkg_from_* fixes

* minor Billy CRs

* hopefully solve Billy's problems
2022-03-18 09:59:45 -07:00
Alexander Neumann
fad0644ade
add port vcpkg-tool-python2 (#23431)
* add vcpkg-tool-lessmsi

* add vcpkg-tool-python2

* adjust vcpkg_find_acquire_program

* use python2 dependency in qt5-base

* remove python2 from qt5-base

* add python2 to qt5-webengine

* use python3 instead of python2

* add some deps on the new vcpkg-tool-python2

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

* add license field

* fix test detection

* error on failure to find python2

* move logs to correct position.

* add dep to qtwebengine

* adjust pybind cmake config.

* fix shiva

* move python2 to manual-tools
adjust search path
generate a details.cmake for vcpkg_find_acquire_program

* format manifest

* use version-date

* version stuff

* replace version-string

* more version stuff

* fix search path and add supports expression

* version stuff

* shiva version

* remove arm windows from support

* reuse output_path
use lessmsi is a host dep so use the correct path

* version stuff

* Fix x86 regression

* version stuff

* try fixing qtinterfaceframework

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: Victor Romero <viromer@microsoft.com>
Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
2022-03-14 10:25:04 -07:00
Adam Johnson
89ed56ebab
[python3] Update to Python 3.10.2. (#23156)
* [python3] Update to Python 3.10.2.

* Version nonsense

* Update Python tool to 3.10.2.

* [python3] Update version file

* [python3] Update versions again

Co-authored-by: Victor Romero <viromer@microsoft.com>
2022-03-11 11:36:11 -08:00
Jack·Boos·Yu
e86ed50718
[vcpkg_configure_make] Report warning when unresolved arguments are passed in (#22567)
* [vcpkg_configure_make] Report warning when unresolved arguments are passed in

* Add missing option NO_DEBUG

* Add _VCPKG_MAKE_NO_DEBUG for vcpkg_configure_make

* Add more condition

* [apr] Remove NO_DEBUG

* [liburing] Remove NO_DEBUG

* [apr-util] Remove NO_DEBUG

* version

* Mssing port-version ++

* version
2022-03-02 13:43:19 -08:00
Daniel Schürmann
a34997af6c
[vcpkg] Meson osx sysroot (#21772)
* [get_cmake_vars] add -isysroot flag independednt of crosscompiling

Even without crosscompiling it is possible to specify a VCPKG_OSX_SYSROOT or
a SDKROOT this should be popagated to autotools and meson builds as well.

* [meson] add -arch and -isysroot to linker flags in case of osx crosscompile

* [meson] avoid DEPRECATION warning about flags in the [properties] section

* [meson] don't set OSXROOT evironment varibale

* [meson] don't set MACOSX_DEPLOYMENT_TARGET environment variable

cmake appends the -mmacosx-version-min flag c/cxx flags, overriding the
value set via VCPKG_C_FLAGS. By setting the environment variable, the
VCPKG_C_FLAGS value was used for meson builds. Now the same value is
taken for both.

* [meson/make] Add CMAKE_OSX_DEPLOYMENT_TARGET to VCPKG_DETECTED_CMAKE_C_FLAGS

This is done in the same way in CMake internally
2022-02-24 11:04:11 -08:00
acd1034
6a67b165a8
Fixes typo in vcpkg_download_distfile.cmake (#23181) 2022-02-22 12:12:49 -08:00
Thomas1664
f7db911f44
[vcpkg docs] Remove deprecated functions from docs (#23018)
* Remove deprecated functions from docs

* Fix docs in cmake files

* Fix links
2022-02-17 17:08:33 -08:00
Jack·Boos·Yu
dc470a9bd7
[vcpkg_find_acquire_program] Update tool flex/bison to 2.5.25, change repo to github (#23084) 2022-02-15 20:32:16 -08:00
Phoebe
897f02781f
[vcpkg_acquire_msys] Update version and hash (#22974)
* [vcpkg_acquire_msys] Update version and hash

* Address the review suggestions

* Update scripts/cmake/vcpkg_acquire_msys.cmake

Revert bash changes

* Update scripts/cmake/vcpkg_acquire_msys.cmake

Revert libintl

* Update scripts/cmake/vcpkg_acquire_msys.cmake

Revert gcc-libs

* Revert diffutils and libreadline

* Revert autoconf sed and make

* Revert gzip file findutils runtime binutils

* Add the revert pkgs back except msys2-runtime

* Update python to 3.9.x cause failure in tensorflow and tensorflow-cc
2022-02-15 20:26:02 -08:00
Daniel Schürmann
016788b220
[vcpkg_configure_make] Fix handling of link flags (#22798)
* [vcpkg_build_make] only link against manual-link folder if exists

* [vcpkg_configure_make] don't set LD_LIBRARY_PATH

This is not recommended during the normal build process
https://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html

* [vcpkg_build_make] Only set the lib path if exists

* [vcpkg_configure_make] Resore handling of _LINK_ environment variable

* [vcpkg_build_make] Backup and restore CPPFLAGS CFLAGS CXXFLAGS RCFLAGS

* [vcpkg_build_make] Fix name of LINKER FLAGS detected from cmake

* [vcpkg_build_make] replace obolete _VAR_SUFFIX with cmake_buildtype
2022-02-15 18:31:16 -08:00
Daniel Schürmann
d15470bb64
[vcpkg_configure_make] Set the --host parameter in case of Linux crosscompile (#22331)
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
2022-02-08 22:53:17 -08:00
Jack·Boos·Yu
dd7550b0fc
[vcpkg_fail_port_install] Deprecate function (#21489)
* [vcpkg_fail_port_install] Deprecate function

* Update doc

* Apply suggestions

* Revert changes about include this function and delete doc

* Apply suggestions

* version

* Update docs/maintainers/vcpkg_fail_port_install.md

Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com>

* Update scripts/cmake/vcpkg_fail_port_install.cmake

* Update scripts/cmake/vcpkg_fail_port_install.cmake

* Use message("${Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL}"  to ensure it works with `--prohibit-backcompat-features`.

Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com>
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-02-03 13:04:55 -08:00
autoantwort
6ba505cf2c
[vcpkg] collect error logs in logs.txt in the buildtrees folder (#22146)
* collect error logs in logs.txt in the buildtrees folder

* Use global variable

* rename file to error-logs-.txt and remove error: prefix in file
2022-01-28 11:30:49 -08:00
Phoebe
7fe7314acb
[vcpkg_find_fortran] Update mingw-* version (#22786)
* [vcpkg_find_fortran] Updat mingw-* version

* Fix hash
2022-01-26 23:02:21 -08:00
Jack·Boos·Yu
f5d67552e0
[vcpkg_execute_build_process] Catch more compiler signal (#22566)
* [vcpkg_execute_build_process] Catch more cc1plus signal

* remove cc1plus

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2022-01-19 09:01:47 -08:00
Phoebe
3d794d08fe
[vcpkg_find_fortran] Update the mingw-w64-i686-mpc* (#22519)
* [vcpkg_find_fortran] Update the mingw-w64-i686-mpc*

* Update the version for x64
2022-01-13 10:53:06 -08:00
Max Khon
7534d241b0
[vcpkg] z_vcpkg_get_cmake_vars(): Use build-type-specific cache variable if VCPKG_BUILD_TYPE is defined (#22461)
* z_vcpkg_get_cmake_vars(): Use build-type-specific cache variable
if VCPKG_BUILD_TYPE is defined

Some ports (e.g. gettext) execute debug and release builds manually
(with different options). If a globally cached copy of cmake vars file
is used, the second build type has no cmake vars defined (e.g. CFLAGS is empty)
because generated and globally cached cmake vars file includes only cmake vars
for the first build type

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
2022-01-11 15:28:43 -08:00
Kai Pastor
03d1a43303
[vcpkg_execute_build_process] Catch ld signal 9 (#22417)
* [vcpkg_execute_build_process] Catch ld signal 9

* Update message output
2022-01-11 14:29:24 -08:00
Alexander Neumann
f5981dabf0
[vcpkg|scripts] correctly restore env vars (#22313) 2022-01-04 20:00:21 -08:00
nicole mazzuca
bfbdf28bf4
[vcpkg_fail_port_install] add a warning about extra args when ALWAYS is passed (#20314)
* [vcpkg_fail_port_install] add a warning about extra args when ALWAYS is passed

* Address the review suggestions

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-12-28 14:43:05 -08:00
Kai Pastor
4b1c874451
Pass native install dir to nmake (#22095) 2021-12-20 11:34:01 -05:00
Daniel Schürmann
1bca1f0203
[tensorflow-common] remove single quotes from vcpkg flags (#21869)
* [vcpkg_acquire_msys] Update bzip2 to 1.0.8-2

* [tensorflow-common] remove single quotes from vcpkg flags

They are escaped like '\'-mtune=native\''  which leads to a compiler error:
cc: error: unrecognized command line option '-mtune=native'
Set via: set(VCPKG_CXX_FLAGS "-mtune=native")
2021-12-17 13:22:50 -05:00
Alexander Neumann
8060230922
[meson] fix windows linker detection (#22032)
* fix meson linker detection .....

* bit of code cleanup in vcpkg_configure_meson

* forgot the version stuff

* put cmake back on path because meson is buggy as hell
2021-12-16 22:47:16 -08:00
Joachim Gehweiler
e92dfa5c01
[tensorflow] update to 2.7, including bazel latest 4.x update (#22022)
* Revert "incorporate changes from microsoft:master"

* Revert "Revert "incorporate changes from microsoft:master""

* update tensorflow to 2.7 and bazel to latest 4.x

* Update version database.

Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-12-15 10:09:54 -08:00
David Federman
ec316f8fac
[python3] Update to 3.10.1 (#21927) 2021-12-10 13:58:11 -08:00
Alexander Neumann
163065a352
Update meson to 0.60.2 (#21542)
* update meson to 0.60.1

* add port vcpkg-tool-meson for consistency deprecate usage of tool-meson

* [skip actions] make every port using meson depend on vcpkg-tool-meson
(except pkgconf for now.)

* fix subtle bugs in vcpkg_find_acquire_program
make the port install meson if the system does not provide it.

* make pkgconf depend on meson

* restore old vcpkg_find_acquire_program behavior for versioning

* Update ports/gstreamer/vcpkg.json

remove duplicated dependency

* remove invalid option in glib

* [skip actions] fix ci failures?

* remove invalid option in gstreamer

* try without cmake

* get more logs from meson configure.

* update glib to 2.70.1

* fix typo

* fix pc file of flac

* update meson to 0.60.2

* try the patch from the other pr.

* patch meson .....

* version stuff

* fix port version

* fix gstreamer version

* remove version

* format-manifest

* version stuff

* format manifest again

* revert version stuff

* remove outdated gtk options

* version stuff

* pango version stuff

* correct baseline lost in merge

* Fix fontconfig version db

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-12-02 15:48:34 -08:00
dave-juicelabs
2496d23d41
[vcpkg-gn] New port vcpkg-gn (#21498)
* [vcpkg-gn] Adding gn as a host only port

* Disable support for x86 and fix variable name usage.

* [vcpkg-gn] Version information.

* Updating documentation.

Co-authored-by: David McCloskey <davmcclo@gmail.com>
2021-11-29 11:42:39 -08:00
itsmattkc
22cd7265e4
[qmake] Check build type for debug/release (#21650) 2021-11-26 01:16:15 -08:00
Burak Arslan
e0201341c9
[vcpkg] Small fixes to vcpkg_build_make (#21296)
* vcpkg_build_make: doc sync

Change-Id: I44c39663c397cbdeadf1b875ee7e6e1c781add05

* vcpkg_build_make: fix typo

Change-Id: I1f401256b2f4e600a1216de499f044ea3c5a2130
2021-11-26 00:25:40 -08:00
Mahder Gebremedhin
446f0d9a37
Fix working directory for archiving from git. (#21166)
- The directory specified no longer matches the directory used for
    fetching.

  - This was overlooked by PR microsoft/vcpkg#19338.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-11-25 23:22:17 -08:00
Jack·Boos·Yu
520b5c4851
[vcpkg_download_distfile] Fix the parameter mismatch issues of some internal functions and fix the recursive call (step 3) (#20585)
* [vcpkg_download_distfile] Fix incorrect arguments in z_vcpkg_download_distfile_test_hash

* Add parameter DISABLE_AIRA2 to avoid recursive calls

* Pass SKIP_SHA512

* Update doc

* typo

* Use downloaded aria2, fix download for multiple url

* typo

* Update vcpkg min release version 2021-11-02

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-11-25 23:21:00 -08:00
Be
6e023eba7b
[docs] document that vcpkg_from_github works with Gitea (#21318)
https://github.com/microsoft/vcpkg/pull/20747#pullrequestreview-779956592
2021-11-22 15:14:23 -08:00
simon987
16c865ef98
Fix cpu detection in meson configuration script (#21382) 2021-11-16 16:50:43 -08:00
Kai Pastor
7dff5e821e
[vcpkg] Revise appdeploy and copy_tool_dependencies (#21092)
* Stop overwriting logs when copying tool dependencies

* Deploy debug dependencies for debug tools

* Deploy dependencies verbosely in debug mode

* Don't silently fail deployment on mutex creation error

* Construct paths portably

* Fix mutex creation on Linux

* Abort on mutex creation errors

* Always copy tool dependencies in verbose mode
2021-11-14 08:48:05 -08:00
Alexander Neumann
356918c4c1
fix regression in vcpkg_find_acquire_program and require exact version match for meson (#21341) 2021-11-12 11:52:32 -08:00
nicole mazzuca
86b23850c3
[scripts-audit] vcpkg_find_acquire_program (#21173) 2021-11-10 22:13:22 -08:00
Osyotr
52fd7e4a64
[vcpkg-cmake-config] Fix parsing of NO_PREFIX_CORRECTION (#21062) 2021-11-08 21:29:35 -08:00
Jack·Boos·Yu
cf308f37ce
[script audit] Meson buildsystem (#21026)
* [script audit] Meson buildsystem

* Apply suggestions, fix build

* Fix non-Windows build

* Fix debug path in meson config

* Fix env pkgconfig path

* Apply suggestions

* Nicole's CRs

* oops

* Apply suggestions

* final changes

* fix typoes

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-11-08 12:27:18 -08:00
Jack·Boos·Yu
66c39e113a
[scripts-audit] QMake buildsystem (#20322)
* [scripts-audit] QMake buildsystem

* Apply suggestions

* Change qt5-base as a host port

* version

* Fix installation

* Apply suggestions

* Update doc

* Typo

* update doc

* Fix bug

* fix vcpkg_host_path_list issue

* Process more host path

* Apply suggestions

* Apply suggestions

* Apply suggestions from code review

* more changes

* Apply suggestions

Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-11-05 16:55:23 -07:00
nicole mazzuca
297f1b8ea0
[scripts-audit] CMake buildsystem (#20885)
* [scripts-audit] vcpkg_configure_cmake

Start auditing vcpkg_configure_cmake

* [scripts-audit] vcpkg_build_cmake

* [scripts-audit] vcpkg_install_cmake

* wow that was a dumb bug

* fix x86 configure, fix `if` guidelines

* Billy's CRs

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-11-05 16:55:14 -07:00
nicole mazzuca
efdf9346ab
[scripts-audit] nmake buildsystem (#20987)
* [scripts-audit] vcpkg_install_nmake

* [scripts-audit] vcpkg_build_nmake

hoping not to make too many changes, just minor simplifications

* is this the issue with gdal?

* back-compat hack woot

* remove port-specific workaround

* dg0yt CR
2021-11-05 16:55:01 -07:00
autoantwort
cb1db07258
[vcpkg_download_distfile] allow uppercase SHA512 (#21157) 2021-11-05 14:23:33 -07:00