Skip to content

[cmake] Update to 3.21.1#18955

Merged
BillyONeal merged 15 commits intomicrosoft:masterfrom
JackBoosY:dev/jack/update_cmake_3.21.0
Aug 12, 2021
Merged

[cmake] Update to 3.21.1#18955
BillyONeal merged 15 commits intomicrosoft:masterfrom
JackBoosY:dev/jack/update_cmake_3.21.0

Conversation

@JackBoosY
Copy link
Contributor

Fixes #18952.

@JackBoosY JackBoosY added info:internal category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly labels Jul 15, 2021
@JackBoosY
Copy link
Contributor Author

Waiting for vcpkg next release to fix the regressions.

@JackBoosY JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Jul 15, 2021
@BillyONeal
Copy link
Member

Depends on #18983

@BillyONeal BillyONeal removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Jul 17, 2021
@BillyONeal
Copy link
Member

pistache should be fixed by #18994

@JackBoosY
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@dg0yt
Copy link
Contributor

dg0yt commented Jul 19, 2021

I already commented in #18983 (comment), but it may belong to this PR: Users are not notified that they need to re-bootstrap in order to enable cmake 3.21.0 support:

include("${SCRIPTS}/cmake/vcpkg_minimum_required.cmake")
vcpkg_minimum_required(VERSION 2021-05-05)

@JackBoosY JackBoosY marked this pull request as ready for review July 19, 2021 05:39
@JackBoosY JackBoosY requested a review from PhoebeHui July 19, 2021 05:46
@PhoebeHui PhoebeHui added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jul 19, 2021
@PhoebeHui PhoebeHui removed the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jul 22, 2021
@JackBoosY
Copy link
Contributor Author

JackBoosY commented Jul 27, 2021

@BillyONeal
All the linux regressions are related to meson which in our pipeline system:

-- Found meson('0.53.2') but at least version 0.58.1 is required! Trying to use internal version if possible!
-- Configuring x64-linux-dbg
CMake Error at scripts/cmake/vcpkg_execute_required_process.cmake:127 (message):
    Command failed: /usr/bin/python3 /usr/bin/meson -Dfontconfig=enabled -Dfreetype=enabled -Dxlib=enabled -Dxcb=disabled -Dxlib-xcb=disabled -Dglib=enabled -Dtests=disabled -Dzlib=enabled -Dpng=enabled -Dspectre=auto -Dsymbol-lookup=disabled -Dgtk2-utils=disabled --buildtype plain --backend ninja --wrap-mode nodownload --native /mnt/vcpkg-ci/buildtrees/cairo/meson-nativ-x64-linux.log --default-library static --libdir lib --native /mnt/vcpkg-ci/buildtrees/cairo/meson-nativ-x64-linux-debug.log -Ddebug=true --prefix /mnt/vcpkg-ci/packages/cairo_x64-linux/debug --includedir ../include -Dcmake_prefix_path=['/mnt/vcpkg-ci/installed/x64-linux/debug','/mnt/vcpkg-ci/installed/x64-linux'] /mnt/vcpkg-ci/buildtrees/cairo/src/3627ff7ec2-8ced788615.clean
    Working Directory: /mnt/vcpkg-ci/buildtrees/cairo/x64-linux-dbg

meson.build:1:0: ERROR: Meson version is 0.53.2 but project requires >= 0.54.0

A full log can be found at /mnt/vcpkg-ci/buildtrees/cairo/x64-linux-dbg/meson-logs/meson-log.txt

In our pipeline image, internal meson version is 0.53.2, but we required 0.58.1 in vcpkg:

elseif(VAR MATCHES "MESON")
set(MESON_VERSION 0.58.1)
set(PROGNAME meson)
set(REQUIRED_INTERPRETER PYTHON3)
set(APT_PACKAGE_NAME "meson")
set(BREW_PACKAGE_NAME "meson")
set(SCRIPTNAME meson meson.py)
set(REF aeda7f249c4a5dbbecc52e44f382246a2377b5b0)
set(PATHS ${DOWNLOADS}/tools/meson/meson-${REF})
set(URL "https://github.com/mesonbuild/meson/archive/${REF}.tar.gz")
set(ARCHIVE "meson-${REF}.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 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2)
set(_vfa_SUPPORTED ON)
set(VERSION_CMD --version)

@cenit
Copy link
Contributor

cenit commented Jul 29, 2021

there is already cmake 3.21.1, which provides some fixes for vs 2022 preview 2

@JackBoosY JackBoosY removed the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Jul 30, 2021
@JackBoosY JackBoosY changed the title [cmake] Update to 3.21.0 [cmake] Update to 3.21.1 Jul 30, 2021
@JackBoosY
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JackBoosY
Copy link
Contributor Author

The cmake regressions are fake now, need to rerun the pipeline tests.

@JackBoosY
Copy link
Contributor Author

Depends on #19361.

@xavier2k6
Copy link
Contributor

Depends on #19361.

That's merged now, any other hold-ups?

@JackBoosY
Copy link
Contributor Author

Depends on #19453.

@Neumann-A Neumann-A mentioned this pull request Aug 9, 2021
4 tasks
@PhoebeHui PhoebeHui added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Aug 10, 2021
@JackBoosY
Copy link
Contributor Author

Ping @dan-shaw for merge this PR.

@BillyONeal BillyONeal merged commit 9d4c559 into microsoft:master Aug 12, 2021
@BillyONeal
Copy link
Member

Thanks for your contribution!

@JackBoosY JackBoosY deleted the dev/jack/update_cmake_3.21.0 branch August 12, 2021 02:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[CMake] update to 3.21.0

7 participants