Always use vcpkg. #4570
Merged
Always use vcpkg. #4570
Conversation
This file contains 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
|
This pull request has been linked to Shortcut Story #36911: Remove "enable vcpkg" options from CMake command line and bootstrap scripts. |
teo-tsirpanis
commented
Dec 11, 2023
| @@ -39,7 +39,7 @@ option(CMAKE_EXPORT_COMPILE_COMMANDS "cmake compile commands" ON) | |||
| set(TILEDB_INSTALL_LIBDIR "" CACHE STRING "If non-empty, install TileDB library to this directory instead of CMAKE_INSTALL_LIBDIR.") | |||
|
|
|||
| if (NOT TILEDB_VCPKG) | |||
| message(DEPRECATION "Disabling TILEDB_VCPKG is deprecated and will be removed in a future version.") | |||
| message(FATAL_ERROR "Disabling TILEDB_VCPKG is not supported.") | |||
There was a problem hiding this comment.
For now I made this a fatal error. In the near future TILEDB_VCPKG will be completely removed, and passing -DTILEDB_VCPKG=OFF will result in the usual CMake warning about unused variables.
eric-hughes-tiledb
approved these changes
Feb 2, 2024
Comment on lines
-50
to
+56
| cmake -B build ${{ matrix.config != 'Debug' && '-DTILEDB_VCPKG=OFF' }} -DTILEDB_WERROR=ON -DTILEDB_SERIALIZATION=ON -DTILEDB_EXPERIMENTAL_FEATURES=$EXPERIMENTAL -DCMAKE_BUILD_TYPE=${{ matrix.config || 'Release' }} -DTILEDB_SANITIZER=$SANITIZER_ARG -DTILEDB_VCPKG_BASE_TRIPLET=${{ matrix.base_triplet }} | ||
| cmake -B build -DTILEDB_WERROR=ON -DTILEDB_SERIALIZATION=ON -DTILEDB_EXPERIMENTAL_FEATURES=$EXPERIMENTAL -DCMAKE_BUILD_TYPE=${{ matrix.config || 'Release' }} -DTILEDB_SANITIZER=$SANITIZER_ARG -DTILEDB_VCPKG_BASE_TRIPLET=${{ matrix.base_triplet }} | ||
|
|
||
| - name: Configure TileDB CMake (Windows) | ||
| if: contains(matrix.os, 'windows') | ||
| working-directory: ${{ matrix.working_directory || github.workspace }} | ||
| run: | | ||
| cmake -B build -S $env:GITHUB_WORKSPACE ${{ matrix.config != 'Debug' && '-DTILEDB_VCPKG=OFF' }} -DTILEDB_WERROR=ON -DTILEDB_SERIALIZATION=ON -DCMAKE_BUILD_TYPE=${{ matrix.config || 'Release' }} | ||
| cmake -B build -S $env:GITHUB_WORKSPACE -DTILEDB_WERROR=ON -DTILEDB_SERIALIZATION=ON -DCMAKE_BUILD_TYPE=${{ matrix.config || 'Release' }} |
There was a problem hiding this comment.
These changes don't have any effect on downstream dependencies. They could be split out into a separate PR and merged immediately.
| @@ -39,7 +39,7 @@ option(CMAKE_EXPORT_COMPILE_COMMANDS "cmake compile commands" ON) | |||
| set(TILEDB_INSTALL_LIBDIR "" CACHE STRING "If non-empty, install TileDB library to this directory instead of CMAKE_INSTALL_LIBDIR.") | |||
|
|
|||
| if (NOT TILEDB_VCPKG) | |||
| message(DEPRECATION "Disabling TILEDB_VCPKG is deprecated and will be removed in a future version.") | |||
| message(FATAL_ERROR "Disabling TILEDB_VCPKG is not supported.") | |||
|
With conda-forge/tiledb-feedstock#242 being merged, there are no first-party projects that disable vcpkg. This PR can be merged. |
2 tasks
ihnorton
previously requested changes
Apr 2, 2024
There was a problem hiding this comment.
Please also add a section to https://github.com/TileDB-Inc/TileDB/blob/dev/doc/dev/BUILD.md about how to support system packages with links to other projects.
ihnorton
pushed a commit
that referenced
this pull request
Apr 2, 2024
Addresses #4570 (review) --- TYPE: NO_HISTORY
3 tasks
dudoslav
pushed a commit
that referenced
this pull request
Apr 17, 2024
Addresses #4570 (review) --- TYPE: NO_HISTORY
dudoslav
pushed a commit
that referenced
this pull request
Apr 17, 2024
[SC-36911](https://app.shortcut.com/tiledb-inc/story/36911/remove-enable-vcpkg-options-from-cmake-command-line-and-bootstrap-scripts) This PR changes the severity of the message when we configure with `-DTILEDB_VCPKG=OFF` from a `DEPRECATION` to a `FATAL_ERROR`. This means that using the legacy `ExternalProject`-based mechanism for acquiring dependencies is no longer supported. The `ExternalProject` modules have become dead code and will be removed in a subsequent PR. --- TYPE: BUILD DESC: Vcpkg is always enabled; turning the `TILEDB_VCPKG` option off is no longer supported and fails.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
SC-36911
This PR changes the severity of the message when we configure with
-DTILEDB_VCPKG=OFFfrom aDEPRECATIONto aFATAL_ERROR. This means that using the legacyExternalProject-based mechanism for acquiring dependencies is no longer supported. TheExternalProjectmodules have become dead code and will be removed in a subsequent PR.TYPE: BUILD
DESC: Vcpkg is always enabled; turning the
TILEDB_VCPKGoption off is no longer supported and fails.