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

adding meson-build to the linux VM provisioning script #12224

Closed
wants to merge 1 commit into from
Closed

adding meson-build to the linux VM provisioning script #12224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.54.3
Homepage: https://github.com/mesonbuild/meson
Description: Meson build system
6 changes: 5 additions & 1 deletion scripts/azure-pipelines/linux/provision-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \
libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev \
libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \
flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \
xutils-dev dh-autoreconf libgles2-mesa-dev ruby-full pkg-config"
xutils-dev dh-autoreconf libgles2-mesa-dev ruby-full pkg-config python3-pip \
ninja-build"

# Additionally required by qt5-base
APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \
Expand Down Expand Up @@ -72,6 +73,9 @@ sudo apt update
sudo add-apt-repository universe
sudo apt install -y powershell

# Install meson build
sudo pip3 install meson==0.54.3

if [ -z "$StorageAccountName" ]; then
echo "No storage account supplied, skipping."
else
Expand Down
12 changes: 7 additions & 5 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 @@ -235,16 +235,16 @@ function(vcpkg_find_acquire_program VAR)
if(NOT CMAKE_HOST_APPLE)
set(PROGNAME meson)
set(REQUIRED_INTERPRETER PYTHON3)
set(APT_PACKAGE_NAME "meson")
set(PIP3_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)
set(PATHS ${DOWNLOADS}/tools/meson/meson-0.54.3)
set(URL "https://github.com/mesonbuild/meson/archive/0.54.3.zip")
set(ARCHIVE "meson-0.54.3.zip")
set(HASH 908c4645793d99343a4cc8a0e7c38947977ccdecc3401e9d084018956d26c4ab426b6ae34daa5440ee2b97c3907cb251b18b513b3ba7b739411aac7deba9718a)
else()
set(PROGNAME meson)
set(BREW_PACKAGE_NAME "meson")
Expand Down Expand Up @@ -399,6 +399,8 @@ function(vcpkg_find_acquire_program VAR)
set(EXAMPLE ":\n brew install ${BREW_PACKAGE_NAME}")
elseif(DEFINED APT_PACKAGE_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
set(EXAMPLE ":\n sudo apt-get install ${APT_PACKAGE_NAME}")
elseif(DEFINED PIP3_PACKAGE_NAME)
set(EXAMPLE ":\n sudo pip3 install ${PIP3_PACKAGE_NAME}")
endif()
message(FATAL_ERROR "Could not find ${PROGNAME}. Please install it via your package manager${EXAMPLE}")
endif()
Expand Down