diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-11-18 22:36:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 13:36:20 -0800 |
| commit | 3217e2559619d0a6b1d2a78e2a944f2aba84e8ce (patch) | |
| tree | 664a983527ed768a26be242bb8b5bfdc695c8e9e /scripts/cmake/vcpkg_find_acquire_program.cmake | |
| parent | f08e44a3011117df157ee4eac9e8bd63737d2c8c (diff) | |
| download | vcpkg-3217e2559619d0a6b1d2a78e2a944f2aba84e8ce.tar.gz vcpkg-3217e2559619d0a6b1d2a78e2a944f2aba84e8ce.zip | |
[meson|scripts] update scripts (#12945)
* Update meson to a recent commit to fix a bug with 0.56
* rename static libraries built by meson by default on windows
* apply cmake variables detection to meson.
use native/cross files
make arm builds work.
* update munit
* fix fribidi
* fix _FLAGS variables
* set env SDKROOT and MACOSX_DEPLOYMENT_TARGET in configure_meson
* need osx env while building and configuring
* - remove unused env backup functions
- rename internal functions to be prefixed with _vcpkg_
- fix VCPKG_CHAINLOAD_TOOLCHAIN_FILE for ios/freebsd
* replace _vcpkg with vcpkg since _ has special meaning in functions
* rename functions to vcpkg_internal_meson_generate
* update control tool-meson
Diffstat (limited to 'scripts/cmake/vcpkg_find_acquire_program.cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 7d12e8084..1f914c868 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -246,16 +246,19 @@ function(vcpkg_find_acquire_program VAR) set(NOEXTRACT ON) set(HASH 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619) elseif(VAR MATCHES "MESON") - set(MESON_VERSION 0.56.0) + set(MESON_VERSION 0.56.01) set(PROGNAME meson) set(REQUIRED_INTERPRETER PYTHON3) set(APT_PACKAGE_NAME "meson") set(BREW_PACKAGE_NAME "meson") set(SCRIPTNAME meson meson.py) - set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION}) - set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz") - set(ARCHIVE "meson-${MESON_VERSION}.tar.gz") - set(HASH da426e2ac0f657da5672d66143b8f4f45513c269a9a544e8b4c48b4a702743a50d35cbaa37ef4c4fbd7e18b8784c788314927a54faba6a14bb2d468eeaa87607) + set(PATHS ${DOWNLOADS}/tools/meson/meson-91876b40316962620c1705ae14075ab46f8dd644) + set(URL "https://github.com/mesonbuild/meson/archive/91876b40316962620c1705ae14075ab46f8dd644.tar.gz") + set(ARCHIVE "meson-91876b40316962620c1705ae14075ab46f8dd644.tar.gz") + #set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION}) + #set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz") + #set(ARCHIVE "meson-${MESON_VERSION}.tar.gz") + set(HASH 784b740a01de70312f9240d38b683b2065f40572c87d30929386fe417b2cc70bcc86213c86e143f349c78121c9cc6d7392526d6e53512ae22a6ec0db57f26e3e) set(_vfa_SUPPORTED ON) set(VERSION_CMD --version) elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON") |