Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[meson] Update meson to 0.55.1 #12927

Merged
merged 13 commits into from
Aug 17, 2020
Merged

[meson] Update meson to 0.55.1 #12927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fb2ad21
[vcpkg_find_acquire_program] add version check for ninja
Neumann-A Aug 13, 2020
7634161
Change VERSION to NINJA_VERSION
Neumann-A Aug 14, 2020
b292255
Missed VERSION change
Neumann-A Aug 14, 2020
a84fdf4
some more corrections
Neumann-A Aug 14, 2020
32a6ac5
add missing PACKAGES parameter
Neumann-A Aug 14, 2020
f145e06
add osx hash
Neumann-A Aug 15, 2020
04de713
[meson] update to 0.55.1
Neumann-A Aug 15, 2020
f171072
fix command
Neumann-A Aug 15, 2020
e9a7476
Remove apt/brew package names
Neumann-A Aug 15, 2020
4c473e7
move supported around and disable it for freebsd
Neumann-A Aug 15, 2020
1ce48d8
fix small command hickup which does not matter for ninja
Neumann-A Aug 15, 2020
be36062
Merge branch 'ninja-version-check' into update_meson_0.55.1
Neumann-A Aug 15, 2020
ce06465
Merge remote-tracking branch 'upstream/master' into update_meson_0.55.1
strega-nil Aug 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/tool-meson/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: tool-meson
Version: 0.54.2
Version: 0.55.1
Homepage: https://github.com/mesonbuild/meson
Description: Meson build system
2 changes: 2 additions & 0 deletions ports/tool-meson/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
# Currently is used in ports that call vcpkg_find_acquire_program(MESON) in order to force rebuilds.

set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
vcpkg_find_acquire_program(MESON)
message(STATUS "Using meson: ${MESON}")
51 changes: 30 additions & 21 deletions scripts/cmake/vcpkg_find_acquire_program.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,23 +240,18 @@ function(vcpkg_find_acquire_program VAR)
set(NOEXTRACT ON)
set(HASH 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619)
elseif(VAR MATCHES "MESON")
if(NOT CMAKE_HOST_APPLE)
set(PROGNAME meson)
set(REQUIRED_INTERPRETER PYTHON3)
set(APT_PACKAGE_NAME "meson")
if(CMAKE_HOST_WIN32)
set(SCRIPTNAME meson.py)
else()
set(SCRIPTNAME meson)
endif()
set(PATHS ${DOWNLOADS}/tools/meson/meson-0.54.2)
set(URL "https://github.com/mesonbuild/meson/archive/0.54.2.zip")
set(ARCHIVE "meson-0.54.2.zip")
set(HASH 8d19110bad3e6a223d1d169e833b746b884ece9cd23d2539ec02dccb5cd0c56542414b7afc0f7f2adcec9d957e4120d31f41734397aa0a7ee7f9c29ebdc9eb4c)
else()
set(PROGNAME meson)
set(BREW_PACKAGE_NAME "meson")
endif()
set(MESON_VERSION 0.55.1)
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 172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889)
set(_vfa_SUPPORTED ON)
set(VERSION_CMD --version)
elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON")
if(CMAKE_HOST_WIN32)
set(SOURCEFORGE_ARGS
Expand Down Expand Up @@ -419,14 +414,28 @@ function(vcpkg_find_acquire_program VAR)
endif()
else()
vcpkg_find_acquire_program(${REQUIRED_INTERPRETER})
find_file(SCRIPT_${VAR} ${SCRIPTNAME} PATHS ${PATHS} NO_DEFAULT_PATH)
find_file(SCRIPT_${VAR} ${SCRIPTNAME})
set(${VAR} ${${REQUIRED_INTERPRETER}} ${SCRIPT_${VAR}})
find_file(SCRIPT_${VAR} NAMES ${SCRIPTNAME} PATHS ${PATHS} NO_DEFAULT_PATH)
if(NOT SCRIPT_${VAR})
find_file(SCRIPT_${VAR} NAMES ${SCRIPTNAME})
if(SCRIPT_${VAR} AND NOT ${VAR}_VERSION_CHECKED)
set(${VAR} ${${REQUIRED_INTERPRETER}} ${SCRIPT_${VAR}})
do_version_check()
set(${VAR}_VERSION_CHECKED ON)
if(NOT ${VAR})
unset(SCRIPT_${VAR} CACHE)
endif()
elseif(${VAR}_VERSION_CHECKED)
message(FATAL_ERROR "Unable to find ${PROGNAME} with min version of ${${VAR}_VERSION}")
endif()
endif()
if(SCRIPT_${VAR})
set(${VAR} ${${REQUIRED_INTERPRETER}} ${SCRIPT_${VAR}})
endif()
endif()
endmacro()

do_find()
if("${${VAR}}" MATCHES "-NOTFOUND")
if(NOT ${VAR})
if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows" AND NOT _vfa_SUPPORTED)
set(EXAMPLE ".")
if(DEFINED BREW_PACKAGE_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
Expand Down