Commit Graph

778 Commits

Author SHA1 Message Date
Alexander Neumann
f2453e0619
[Qt5|qmake] pass toolchain setup (#26354)
* [qt5/qmake] Pass toolchain flags to build

* v db

* forgot a dependency

* v db

* add required ar flags

* v db

* Apply suggestions from code review

Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>

* v db

* inc port version

* v db

* qt5-base

* v db

Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>
2022-09-12 13:30:47 -07:00
pastdue
0e9a28874c
Add VCPKG_TARGET_IS_EMSCRIPTEN, fix opus and libsodium ports for wasm32-emscripten (#26318)
* vcpkg_common_definitions: Add VCPKG_TARGET_IS_EMSCRIPTEN

* [opus] Fix wasm32-emscripten builds

* [libsodium] Fix wasm32-emscripten builds

* Run x-add-version
2022-09-08 14:01:20 -07:00
Russell Greene
5ace90c530
[scripts] Set VCPKG_TARGET_BUNDLE_SUFFIX to .app for iOS to allow for tools building more cleanly (#26612) 2022-09-01 09:25:11 -07:00
Alexander Neumann
f688b2e296
[vcpkg] add updated compile wrapper for clang-cl (#26340)
* add updated compile wrapper for clang-cl

* patch msys instead of adding the complete wrapper

* remove doubled line

* fix issue with direct packages
2022-08-29 17:30:53 -07:00
Alexander Neumann
624f1b4eca
[jemalloc|vcpkg_configure_make] update and some script fixes (#25009)
* WIP commit

* more jemalloc wip

* v db

* add license

* v db

* apply format diff

* fix script

* WIP commit

* fix ARFLAGS for the wrapper

* CR stuff

* v db

* use separate_arguments to add -Wl, to linker flags

* say "-Xlinker" three times and it will come.

* make assembler compile only.

* disable _FOR_BUILD if crosscompiling.
use function instead of macro.

Remove AS settings

* ignore settings for osx until somebody knows how to fix it.

* CR z_vcpkg_make_set_env

* CI retrigger

* make conflicting options an error

* remove DEFINED since the options are always defined
2022-08-19 15:13:23 -07:00
Alexander Neumann
ef9628f449
[vcpkg script] build_nmake use z_vcpkg_get_cmake_vars (#25862)
* use z_vcpkg_get_cmake_vars instead of including the toolchain

* fix typo

Co-authored-by: Osyotr <Osyotr@users.noreply.github.com>

* add supports expressions

* use _ENV_ instead of ENV so vcpkgs flags will overwrite any other flags.
(also fixes pdcurses using LINK)

* v db

* version

Co-authored-by: Osyotr <Osyotr@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-08-19 15:12:14 -07:00
Cheney Wang
a68c22c9a7
[vcpkg] Fix typo (#26388) 2022-08-18 10:38:09 -07:00
Alexander Neumann
dc9d737351
[pixman] add missing include and fix clang-cl build (#26186)
* pixman: add missing include and fix clang-cl builds

* v db

* use correct <> isntead of ""

* v db

* make the patch depend on _MSC_VER

* v db

* fix bug in vcpkg_configure_meson not linking WindowsApp.lib
fix another bug that system=windowsstore which meson doesn recognize

* bump port version

* v db
2022-08-17 12:36:12 -07:00
autoantwort
9b618499f6
[vcpkg_from_gitlab] improvements (#23568)
* [vcpkg_download_distfile] Don't check downloaded file when ALWAYS_REDOWNLOAD is passed

* [vcpkg_from_github] fix error message and correctly set VCPKG_HEAD_VERSION

* [vcpkg_from_gitlab] Use gitlab api instead of git ls-remote

* no change

* Apply suggestions from code review

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
2022-08-12 15:32:07 -07:00
Billy O'Neal
ae76307e4b
Audit use of TO_NATIVE_PATH. (#26201)
* Audit use of TO_NATIVE_PATH.

TO_NATIVE_PATH should only be used when (1) pasting a path into a command line, or (2) displaying a path to a user. It must not be used before calling other CMake operations like file(WRITE.

Fixes https://github.com/microsoft/vcpkg/issues/26178

ports/ffmpeg/portfile.cmake:
Both uses are being embedded into a command line 

ports/gdal/dependency_win.cmake
117: This used TO_NATIVE_PATH but didn't actually connect the result. It's going on a command line so TO_NATIVE_PATH is appropriate.
Drive by: Added quotes around other uses (all of which seem to be going to command lines).
202: ${EXPAT_LIBRARY_REL} ${ZLIB_LIBRARY_REL} don't seem to be set even though they are used; I think this is wrong but I don't know for sure that it is so I'm leaving it alone for now.

ports/msmpi/portfile.cmake
All 3 uses are being embedded into a command line 

ports/jemalloc/fix-utilities.patch
ports/libproxy/fix-dependency-libmodman.patch
ports/qtbase/env.patch
These are in upstream content / context so it is not edited.

ports/opengl/portfile.cmake
Broken! Drive by fixes:
* Modernized checking VCPKG_BUILD_TYPE
* Ordered things consistently to be release then debug.
* Removed funny newlines.

ports/openni2/portfile.cmake
Borderline OK; it goes into an MSBuild / vcxproj. I'm leaving it alone. Drive by fixes:
* Guarded debug-only copies for VCPKG_BUILD_TYPE
* Fixed supports expression

ports/openssl/unix/CMakeLists.txt:
Unused!

ports/pthreads/portfile.cmake:
Both uses are being embedded into a command line 

ports/qt5-base/cmake/qt_fix_makefile_install.cmake
I'm not sure if this one is OK but it's being embedded into a file so it's probably fine.

ports/qtapplicationmanager/portfile.cmake:
I'm pretty sure this one is wrong, but it's guarded by VCPKG_TARGET_IS_WINDOWS so the ability to create damage is limited.

ports/readosm/portfile.cmake:
The use is being embedded into a command line 

ports/spatialite-tools/portfile.cmake:
The use is being embedded into a command line 

ports/sqlcipher/portfile.cmake:
Both uses are being embedded into a command line 

scripts/ports.cmake:
Some uses were unused, others are immediately used and printed to the console. 

scripts/buildsystems/vcpkg.cmake:
Fixed :)

scripts/cmake/vcpkg_build_qmake:
Looks unused.

scripts/cmake/vcpkg_build_process.cmake:
Added to console message only. 

scripts/cmake/vcpkg_execute_required_process_repeat.cmake:
Added to console message only. 
Drive by: Fixed typo in variable name in the message.

scripts/cmake/vcpkg_execute_required_process.cmake:
Added to console message only. 

* Fix missing license.
2022-08-12 15:21:20 -07:00
Thomas1664
48369f2a2a
[vcpkg_download_distfile] Make file name more unique (#25607)
* [vcpkg_download_distfile] Add parameter `FILE_DISAMBIGUATOR`

* Add argument checks

* Make unparse args a fatal error

* Remove trailing ;

* Append instead of prepend hash

* Always append commit hash

* Only append file hash if hash differs from already installed file with same name
2022-08-01 15:14:44 -07:00
autoantwort
12a005017b
[dcmtk] no absolute paths (#25964) 2022-07-27 11:41:12 -07:00
Alexander Neumann
d052cd6113
[vcpkg script] Normalize PATH so that insertion of msys paths always works (#25848)
* Normalize PATH so that insertion of msys paths always works

This is required if the PATH variable has been modified and doesn't follow the normal windows style

* make it better

* switch path manipulations. vcpkg wrapper dir needs to come first.
2022-07-25 13:26:12 -07:00
Kai Pastor
49868fd552
[vcpkg-cmake] Update parallel vcpkg_cmake_configure (#21507)
* Revise generator selection

If the host is x86, assume that msbuild is requested for windows.
If msbuild is requested and suitable, use it.
Else if a particular generator is requested, use it.
Else if ninja is available, use it.
Else on non-windows host, use "Unix Makefiles".

* Revise ninja_host detection

* Revise parallel configure detection

* Consolidate ninja path setup

* Update documentation

* Use portable chdir

* [ms-gltf] Use new generator selection

* Update versions
2022-07-25 12:23:04 -07:00
Kai Pastor
687f4aab11
Save meson logs on failure (#25806)
* [vcpkg_configure_meson] Save log files on error

* Document SAVE_LOG_FILES option
2022-07-18 13:21:36 -07:00
Osyotr
42b2876645
[vcpkg] Fixup rpath after building dynamic libraries on linux (#23035)
* Fixup rpath after building dynamic libraries on linux

* Switch back to a single variable VCPKG_FIXUP_ELF_RPATH

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>

* Don't force fixup in x64-linux triplet yet

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com>
2022-07-18 12:44:34 -07:00
Jamlys Lee
de176433e9
[meson] Add support for loongarch64 cpu. (#25615)
* Add support for loongarch64 cpu.

* update ci.baseline.txt

* Revert "update ci.baseline.txt"

This reverts commit 0b3f4851bc.

* Allow user to add additional options for meson within custom triplet.

Co-authored-by: Jamlys Lee <jamlys_lee@163.com>
2022-07-17 19:41:15 -07:00
Thomas1664
c69f2b9098
[vcpkg] Add vcpkg_install_copyright() portfile function (#25239)
* [vcpkg tool] Add vcpkg_install_copyright

* Make sure FILE_LIST is provided

* relative to ${SOURCE_PATH}

* Add documentation

* Add to table of contents

* Relative paths was a bad idea.

* Tell users to use the correct way

Co-authored-by: Billy O'Neal <bion@microsoft.com>

* Fix docs

* Add parameter COMMENT

* Rename to vcpkg_concat_copyright

* Fix escape

* Revert "Fix escape"

This reverts commit 53f1636705.

* Revert "Rename to vcpkg_concat_copyright"

This reverts commit 6ce9152a61.

* Fix escape

* Add support for single copyright file

* Update docs

* Make comment less confusing

* [ci skip] Billy CR

* [ci skip] Format

* Remove explicit checks for STREQUAL ""

* Add error msg if file doesn't exist

Co-authored-by: Billy O'Neal <bion@microsoft.com>
2022-07-13 09:41:52 -07:00
Kai Pastor
39b548c8e5
[scripts|world rebuild] Always save config.log and CMakeCache.txt (#25189)
* Always save config.log, even on error

* Always save config.log and CMakeCache.txt[.log]

* Add SAVE_LOG_FILES option

* Make implicit lookups explicit

* Update versions
2022-07-07 14:58:03 -07:00
Kai Pastor
69cd3402c0
[vcpkg_setup_pkgconfig_path] Fix backup/restore (#25361)
* Unit-test vcpkg_backup/restore_env_vars

* Unit-test z_vcpkg_setup/restore_pkgconfig_path

* Fix z_vcpkg_setup_pkgconfig_path env var backup

* Move parent-scoping into vcpkg_backup_env_variables command

* Test repeated restore

* Unset z_vcpkg_backup_env_variables_arg_vars

* Documentation updates

* Inline pkgconfig env vars backup

* Revert obsolete changes

* Fix typo

* Remove duplicate doc file
2022-06-29 14:47:44 -07:00
Juan Carlos Arevalo Baeza
61e686b24c
[vcpkg-cmake] Fix the application of VCPKG_CMAKE_CONFIGURE_OPTIONS with more than one option (#25123)
* Fix the application of VCPKG_CMAKE_CONFIGURE_OPTIONS with more than one option

VCPKG_CMAKE_CONFIGURE_OPTIONS (plural) is meant to be a list of options to be added to a cmake invocation.

But it was being applied quoted, which disallowed it from containing multiple options.
- If it was initialized with a list, cmake would get the options ";"-separated.
- If it was initialized with a blank-separated string, cmake would get the entire astring quoted as a single argument.

The fix is simple: don't (ever) quote arguments to list(APPEND) unless they are really meant to be a single element to append to the list.

* Update the version-date of vcpkg-cmake

* Update hash after rebase

* Fix vcpkg-cmake.json

In my defence, I'm new to this...

Co-authored-by: Juan Carlos Arevalo Baeza (JCAB) <jcab@ntdev.microsoft.com>
2022-06-20 13:58:43 -07:00
Adam Johnson
c266859544
[python3] Update to 3.10.5. (#25105)
* [python3] Update to current

* update versions to current

* [vfap] update python3 to current

* update vcpkgTools.xml
2022-06-17 14:15:56 -07:00
Max Khon
2e4c6df44c
[vcpkg_execute_*_process] Add support for build profiling (#22676)
Use --x-cmake-args=-DX_PORT_PROFILE=TRUE to enable port build profiling
2022-06-10 10:56:44 -07:00
Robert Schumacher
7d2449c346
[docs] Delete embedded documentation in favor of docs/ (#25096)
* [docs] Delete embedded documentation in favor of docs/

Drive-by for the helper ports:
1. "documentation": "https://vcpkg.io/en/docs/README.html"
2. "license": "MIT"
3. Use `include_guard(GLOBAL)` in all script files
4. Make sure any persistent variables are saved to the cache

* [docs] Restore empty regenerate.ps1 to satisfy Azure Pipelines

* [docs] PR comments
2022-06-07 16:26:51 -07:00
Kai Pastor
f20c7bf05b
[vcpkg-configure-make] Fix include path prepending (#24823)
* Fix include path prepending

* Update DISABLE_VERBOSE_FLAGS documentation

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>

Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
2022-05-20 14:41:10 -07:00
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
nicole mazzuca
bad2c589d5
[vcpkg_host_path_list] add SET subcommand (#20879)
* [vcpkg_host_path_list] add SET subcommand

* update docs

* try to do something that Billy might like more?

* wheee

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-11-03 21:42:05 -07:00
Kai Pastor
fdb593292c
[vcpkg] Always use an autotools build triplet (#18130)
* Always use a build triplet for mingw

* [vcpkg_configure_make] Always assume cross-compilation

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
2021-11-03 21:29:29 -07:00
Stefano Sinigardi
7375bb408f
[NUGET] update to 5.11.0 (#21058)
* [NUGET] update to 5.11.0

* [nuget] update hash
2021-11-03 00:58:06 -07:00
Victor Romero
75b6191dff
[vcpkg_download_distfile] Check SHA512 for already downloaded files (#20988)
* [vcpkg_download_distfile] Check SHA512 for already downloaded files

* [vcpkg_download_distfile] Respect SKIP_SHA512 to enable --head
2021-10-27 10:36:59 -07:00
Dawid Wróbel
8cbc51f36b
[Docs] vcpkg_copy_tools cleans only copied tools (#20940)
Clarify that AUTO_CLEAN only removes the executables previously copied, not all of them.
2021-10-26 23:44:43 -07:00
Dawid Wróbel
542693b300
[vcpkg_acquire_msys] Add gzip to default packages (#20393)
Fixes #20392
2021-10-26 22:24:18 -07:00
Jack·Boos·Yu
5283cdb370
[scripts-audit] Make buildsystem (#20165)
* [script-audit] Make buildsystem

* Fix wrongly merge

* Fix rename

* Format

* Apply suggestions

* Apply suggestion

* Fix bug

* Change the function names

* Fix command line

* Apply suggestions

* version

* typo

* Apply suggestions

* Fix bug

* Fix path

* Fix bug

* Fix un=parser code, move macros to the top

* Apply suggestions

* Update docs

* update doc

* CRLF

* add docs and add a PARENT_SCOPE

* Update doc

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-10-20 14:12:58 -07:00
Jack·Boos·Yu
b8c39998ea
[vcpkg_from_github] Fix parse error on OSX (#20650) 2021-10-12 17:07:28 -07:00
Jack·Boos·Yu
143cfa363c
[vcpkg_configure_make] Fix environment variable _LINK_ (#20652) 2021-10-11 20:41:51 -07:00
Adam Johnson
15dab6a762
[python3] Upgrade to Python 3.10.0 (#20519)
* [python3] Update to Python 3.10.0rc2 (for testing).

* [python3] Revert trivial patch changes.

* [python3] Bump to 3.10.0 final.

* x-add-version

* update python tools to 3.10.0

* [ecm] Add patch from upstream for Python 3.10.

Remove this on the next release.

* x-add-version

* [python3] Add patch to fix static interpreter.

* x-add-version
2021-10-06 12:53:06 -07:00
Dawid Wróbel
7aa1a14c5f
[vcpkg_copy_tools] support copying .app bundles (#20210)
* [vcpkg_copy_tools] support copying .app bundles

* check for VCPKG_TARGET_IS_OSX

* Fix formatting

* [vcpkg_copy_tools] copy bundle and plain bin if both present

* Update scripts/cmake/vcpkg_copy_tools.cmake

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
2021-10-04 12:40:14 -07:00
Kai Pastor
2ed5383f7b
[vcpkg_configure_make] Standardize OPTIONS list item handling (#19540)
* Remove unused EXTRA_QUOTES

* Uniformly invoke 'configure'

* [libtasn1] Fix mingw build

* Unify prefix handling

* Revise install dir processing

* x-add-version

* Force libdir to lib (adopted from #19666)

* [skip actions] CI rebuild

* CR request: Put backslash before shell var

* CR request: Use vcpkg_list

* Update versions

* Fix python3 options

* Update versions

* Bump python port-version.

* CR request: Add comment about backslashes before prefix

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-09-30 23:58:36 -07:00
Michael Heyman
7e5cfccf60
[vcpkg/msbuild] parellel build (#19718)
* [vcpkg/msbuild] parellel build

* [vcpkg/msbuild] respects VCPKG_MAX_CONCURRENCY

* [vcpkg/msbuild] handle unset VCPKG_MAX_CONCURRENCY

* [vcpkg/msbuild] uses VCPKG_CONCURRENCY

* [vcpkg/msbuild] MultiProcMaxCount=...

* [vcpkg/msbuild] EnforceProcessCountAcrossBuilds

EnforceProcessCountAcrossBuilds=true (must have value)

* [vcpkg/msbuild] no missing )

* [vcpkg/msbuild] no extra ' 's

Co-authored-by: mheyman <mheyman@localdomain>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-09-30 16:39:14 -07:00
nicole mazzuca
f0281bf749
[scripts-audit] vcpkg_fixup_pkgconfig (#19658)
* [scripts-audit] vcpkg_fixup_pkgconfig

* Neumann-A CR, fix docs

* vcpkg_fixup_pkgconfig bugs

* fix group

* moar fixing

* be more clever around pkg_config_path

* add `vcpkg_host_path_list` so that we can unit test

* move stuff around a bit

* fix bug in vcpkg_host_path_list.cmake

* ras0219 CRs
2021-09-27 13:27:44 -07:00
Nicolas Fella
59a3f35e7e
[vcpkg_configure_make] Force libdir to lib (#19666)
Some Linux distributions (e.g. the OpenSUSE family) defaults to lib64
instead of lib, which breaks vcpkg's assumtion that libraries are in
lib.

Use the --libdir option of autotools to force the directory to be lib
2021-09-24 12:41:20 -07:00
Alexander Neumann
a4368eabea
[pkgconf] Update to 1.8 (and a few extras; world rebuild) (#20243)
* [vcpkg/script/meson] add option NO_PKG_CONFIG to skip pkg-config setup

* [vcpkg/script/pkgconfig] move vcpkg_find_acquire_program(PKGCONFIG) into the check section where it is used

* [pkgconf] Update to 1.8.0

* version stuff

* remove unused patch.

* (CR) quote string

* version update.
2021-09-24 12:11:38 -07:00
Krisztián Szabó
bb92b7d34d
CMake binary is now supplied to Meson in cross-compile configurations. (#19727)
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-09-24 12:02:48 -07:00
Dawid Wróbel
14c814bfc7
[vcpkg_fixup_pkgconfig] Add support for Cflags.private (#19852) 2021-09-23 16:04:46 -07:00
autoantwort
6d617de25d
docs: Improve docs for vcpkg_build_nmake (#20139) 2021-09-14 14:26:31 -07:00
Kai Pastor
49ce29005d
Don't touch mingw static lib .a suffix (#20096) 2021-09-13 20:22:04 -07:00
Alexander Neumann
b12f98e221
update some msys components (#19654) 2021-09-13 20:18:37 -07:00
Phoebe
c592209c5f
[vcpkg_cmake_configure/vcpkg_configure_cmake] Support VS2022 17.0 (#19088)
* [vcpkg] Support VS2022 17.0

* small changes

* Update vcpkg.cmake

* Update the baseline version

* Update the baseline version

* Update the baselin version

* Adress the review suggestions

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-09-13 20:10:12 -07:00
JonLiu1993
35312384e7
[Python3] update to 3.9.7 (#19851)
* [Python3] update to 3.9.7

* update version

* update vcpkg tool python3 to 3.9.7

* update hash to lowercase

* update portifile.cmake

* update version
2021-09-13 20:00:44 -07:00
autoantwort
c24f57e9fc
[meson] fix cross compiling from linux to windows (#18927)
* [meson] fix cross compiling from linux to windows

* Fix mingw system name

* Omit empty fields from standard libraries

* Use VCPKG_CROSSCOMPILING

* vcpkg_configure_meson: do not double escape include paths

* vcpkg_configure_meson: set winres instead of rc

* vcpkg_configure_meson: do not always cross build

* Apply suggestions from code review

* fix the issue I made

* [meson] error when gcc uses a different linker executeable

* [meson] apply code review from strega-nil

* [meson] more verbose error messages

* [meson] remove wrong check

Co-authored-by: Kai Pastor <dg0yt@darc.de>
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-09-09 20:41:01 -07:00
Phoebe
021e10a7d5
[vcpkg_from_github] Fix version regex matching issue (#19815) 2021-09-01 11:10:22 -07:00