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.

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

[Backport release-2.18] Always use FetchContent to get vcpkg. #4543

Merged

Conversation

teo-tsirpanis
Copy link
Member

Backport 1f4ed0a from #4484.


TYPE: BUILD
DESC: Remove the externals/vcpkg submodule. Vcpkg is always downloaded by CMake.

Custom triplets already exist for all our target platforms, so patching the vcpkg-provided ones has no effect.
@teo-tsirpanis
Copy link
Member Author

Fixes vcpkg initialization failures under certain circumstances1 due to a typo in #45292. Verified on my WSL environment.

This is a more complete backport of #4484. Instead of choosing between either the submodule or FetchContent we always use FetchContent, making things more consistent and predictable. #4484 has been in dev for almost a month with no related failures.

If CI succeeds it should be OK; the same code is now used regardless of whether we get TileDB from a Git repository or a tarball.

Footnotes

  1. If we build from a non-Git repository and there is a .git directory two levels above the source directory.

  2. This line should have said CMAKE_CURRENT_LIST_DIR.

@teo-tsirpanis teo-tsirpanis marked this pull request as ready for review November 28, 2023 02:12
@ihnorton
Copy link
Member

I think the underlying issue fixed here caused the failure in conda-forge/tiledb-feedstock#218

(@teo-tsirpanis please confirm, so we can skip that conda build if so)

@KiterLuc KiterLuc merged commit 9217229 into TileDB-Inc:release-2.18 Nov 28, 2023
51 checks passed
@teo-tsirpanis teo-tsirpanis deleted the vcpkg-fetchcontent-2.18 branch November 28, 2023 09:47
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.

3 participants