Skip to content

[rollup:2021-07-06] Rollup PR#18838

Merged
BillyONeal merged 11 commits intomicrosoft:masterfrom
strega-nil:rollup-2021-07-06
Jul 14, 2021
Merged

[rollup:2021-07-06] Rollup PR#18838
BillyONeal merged 11 commits intomicrosoft:masterfrom
strega-nil:rollup-2021-07-06

Conversation

@strega-nil-ms
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@PhoebeHui
Copy link
Contributor

tensoflow:x64-osx would be skipped in baseline, see #18812

strega-nil and others added 3 commits July 9, 2021 14:54
[scripts-audit] add guidelines for cmake
[vcpkg-cmake-config] documentation fix
@strega-nil-ms strega-nil-ms force-pushed the rollup-2021-07-06 branch 2 times, most recently from 4bb5dbc to a0b8334 Compare July 11, 2021 13:55
@strega-nil-ms
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@PhoebeHui
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

strega-nil and others added 3 commits July 13, 2021 14:15
[scripts-audit] vcpkg_extract_source_archive
JackBoosY and others added 4 commits July 13, 2021 14:15
[vcpkg] Update the minimum version of vcpkg
[vcpkg_from_git] Fix error if downloads folder does not exist
@strega-nil-ms
Copy link
Contributor Author

I figured out the problem with the infinite looping. Unfortunately, CMake does not support trailing \ in arguments, and doesn't warn when that happens. This is another "we probably need to replace stuff" :(

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NB: we believe this is a bug. No change requested.

- This `cmake_minimum_required` should be bumped every time a new version
of CMake is added to `vcpkgTools.xml`, as should the
`cmake_minimum_required` in all of the helper `CMakeLists.txt` files.
- `vcpkg.cmake` must assume a version of CMake back to 3.1 in general
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@strega-nil In the context of #18898, I created a test port for the minimum cmake version.
Even with #18898, at least CMake 3.4 is needed to use vcpkg.cmake:
All scripts in scripts/toolchains/ do use string(APPEND ...).

$ git grep -l "string(APPEND" scripts/toolchains
scripts/toolchains/android.cmake
scripts/toolchains/freebsd.cmake
scripts/toolchains/ios.cmake
scripts/toolchains/linux.cmake
scripts/toolchains/mingw.cmake
scripts/toolchains/openbsd.cmake
scripts/toolchains/osx.cmake
scripts/toolchains/windows.cmake

https://cmake.org/cmake/help/v3.4/release/3.4.html#commands

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It even nobody complained that it is 3.15 currently

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, okay. This might argue for updating our minimum supported version to 3.4, since we haven't heard complaints.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It even nobody complained that it is 3.15 currently

I did. And I would have complained earlier if the vcpkg ports I need would be mature enough for usage on Ubuntu 18.04 / CMake 3.10.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants