Skip to content

Commit

Permalink
Update project_options to v0.26.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ljishen committed Feb 25, 2023
1 parent 5dad1f3 commit ae80458
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ if(BITAR_FETCHCONTENT_OVERWRITE_CONFIGURATION)
set(FETCHCONTENT_BASE_DIR "${MACHINE_OPTIONAL_DIR}/_deps")
endif()

# Add project_options v0.26.2
# Add project_options v0.26.3
FetchContent_Declare(
_project_options
# Ensure anything that depends on the extracted contents will be rebuilt
# whenever the URL changes
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
URL https://github.com/aminya/project_options/archive/refs/tags/v0.26.2.zip)
URL https://github.com/aminya/project_options/archive/refs/tags/v0.26.3.zip)
FetchContent_MakeAvailable(_project_options)
include("${_project_options_SOURCE_DIR}/Index.cmake")

Expand All @@ -75,15 +75,15 @@ set(VCPKG_ROOT
get_filename_component(_vcpkg_parent_dir "${VCPKG_ROOT}" DIRECTORY)
file(MAKE_DIRECTORY "${_vcpkg_parent_dir}")
# Use vcpkg for library management - should be called before defining project():
# https://github.com/microsoft/vcpkg/tree/2022.11.14#vcpkg-as-a-submodule. If
# https://github.com/microsoft/vcpkg/tree/2023.01.09#vcpkg-as-a-submodule. If
# updating vcpkg dependencies is required, use "-DENABLE_VCPKG_UPDATE:BOOL=ON"
run_vcpkg(VCPKG_DIR "${VCPKG_ROOT}" VCPKG_URL
"https://github.com/microsoft/vcpkg.git" ENABLE_VCPKG_UPDATE)

# Environment variable VCPKG_FORCE_SYSTEM_BINARIES must be set on arm, s390x,
# and ppc64le platforms before running the vcpkg toolchain that is invoked by
# the project command. See
# https://github.com/microsoft/vcpkg-tool/blob/2022-12-14/src/vcpkg.cpp#L275-L284
# https://github.com/microsoft/vcpkg-tool/blob/2023-01-24/src/vcpkg.cpp#L275-L284
# The variable CMAKE_HOST_SYSTEM_PROCESSOR cannot be used for checking the host
# system architecture, because it is set only after the project command.
if((machine_hardware_name_lower MATCHES "^arm"
Expand Down
2 changes: 1 addition & 1 deletion cmake_modules/FindArrow.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ else()
"Use the Arrow library from the git repository for building when needed"
)
set(BITAR_ARROW_GIT_TAG
"7e5730f4f64c9e6229840b439832e90cc84489ee"
"db60be2bc2e1fc9aec43bb632be894bb8da6c77b"
CACHE
STRING
"Use the source at the git branch, tag or commit hash from the Arrow repository for building when needed"
Expand Down
10 changes: 5 additions & 5 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"name": "bitar",
"homepage": "https://github.com/ljishen/bitar",
"description": "Bitar is a C++ library to simplify accessing hardware compression/decompression accelerators.",
"builtin-baseline": "71f51b100be2b5d32e3907572d99dc2f97088c8d",
"builtin-baseline": "223d33be7d3ec6c3d64381ca37f501b8c87dda6a",
"dependencies": [
{
"name": "abseil",
"version>=": "20220623.1",
"version>=": "20230125.0",
"features": ["cxx17"]
},
{
"name": "cxxopts",
"version>=": "3.0.0"
"version>=": "3.1.0"
},
{
"$explanation": ["Dependency for system-installed Apache Arrow library"],
"name": "curl",
"version>=": "7.86.0#1",
"version>=": "7.88.1",
"default-features": false
},
{
Expand Down Expand Up @@ -56,7 +56,7 @@
"dependencies": [
{
"name": "catch2",
"version>=": "3.2.1"
"version>=": "3.3.1"
}
]
}
Expand Down

0 comments on commit ae80458

Please sign in to comment.