[libmagic] Add CMake config.#35274
Merged
vicroms merged 6 commits intomicrosoft:masterfrom Dec 1, 2023
Merged
Conversation
7 tasks
dg0yt
suggested changes
Nov 22, 2023
Contributor
dg0yt
left a comment
There was a problem hiding this comment.
The config also needs to append to IMPORTED_CONFIGURATIONS.
Co-authored-by: Kai Pastor <[email protected]>
8bf36d8 to
4d2a7bf
Compare
Contributor
Author
|
Feedback addressed. I also set |
dg0yt
reviewed
Nov 22, 2023
4d2a7bf to
d8569ff
Compare
d8569ff to
f448c5e
Compare
dg0yt
reviewed
Nov 23, 2023
Comment on lines
+69
to
+74
| include(CMakePackageConfigHelpers) | ||
| configure_package_config_file( | ||
| "${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-config.cmake.in" | ||
| "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" | ||
| INSTALL_DESTINATION "share/unofficial-${PORT}" | ||
| ) |
Contributor
There was a problem hiding this comment.
FTR I believe that configure_package_config_file is intented for CMake project mode, but here it is used in script mode. Let's hope there are no future changes which break this use case.
JonLiu1993
approved these changes
Nov 24, 2023
Contributor
|
Tested usage successfully by |
Contributor
Author
|
Is there anything left to do here? |
vicroms
requested changes
Nov 30, 2023
vicroms
approved these changes
Dec 1, 2023
KiterLuc
pushed a commit
to TileDB-Inc/TileDB
that referenced
this pull request
Mar 12, 2024
[SC-38521](https://app.shortcut.com/tiledb-inc/story/38521/update-libmagic-and-use-the-upstream-vcpkg-port) Split from #4553. This PR updates libmagic to version 5.45 and switches to using a vcpkg port closer to the upstream one, which we can easily consume with find_package(unofficial-libmagic) since microsoft/vcpkg#35274. One complication is that the upstream port builds libmagic with its official autotools-based build system, which is significantly slower on Windows (on Linux it builds pretty fast). I tried to upstream the CMake-based port I had added in #4119, but the PR was rejected. Apart from binary caching, there is unfortunately nothing we can do about the build performance regression. We could maintain the CMake-based port for our own use, but it will split what we build and what a future user of TileDB from vcpkg will build, and that port is not without its problems (it failed for example when I tried cross-compiling to arm64-windows, because it tried to execute the arm64 file.exe on my x64 machine). --- TYPE: BUILD DESC: Update libmagic to version 5.45
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
./vcpkg x-add-version --alland committing the result.