Skip to content

Commit 1816d59

Browse files
committed
Add croaring dependency
1 parent e4fd340 commit 1816d59

File tree

3 files changed

+41
-1
lines changed

3 files changed

+41
-1
lines changed

src/iceberg/meson.build

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,19 @@ iceberg_sources = files(
5454
'util/timepoint.cc',
5555
)
5656

57+
# CRoaring does not export symbols, so on Windows it must
58+
# be used as a static lib
59+
croaring_needs_static = (
60+
get_option('default_library') == 'static' or
61+
host_machine.system() == 'windows'
62+
)
63+
croaring_dep = dependency('croaring', static: croaring_needs_static)
5764
nanoarrow_dep = dependency('nanoarrow')
5865
nlohmann_json_dep = dependency('nlohmann_json')
5966
spdlog_dep = dependency('spdlog')
6067
zlib_dep = dependency('zlib')
6168

62-
iceberg_deps = [nanoarrow_dep, nlohmann_json_dep, spdlog_dep, zlib_dep]
69+
iceberg_deps = [croaring_dep, nanoarrow_dep, nlohmann_json_dep, spdlog_dep, zlib_dep]
6370

6471
iceberg_lib = library(
6572
'iceberg',

subprojects/croaring.wrap

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
[wrap-file]
19+
directory = CRoaring-4.3.11
20+
source_url = https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.3.11.tar.gz
21+
source_filename = CRoaring-4.3.11.tar.gz
22+
source_hash = acd3a17e6c95acf3154d60c38c90e927e6c531805bc740a040fa111819af380e
23+
patch_filename = croaring_4.3.11-1_patch.zip
24+
patch_url = https://wrapdb.mesonbuild.com/v2/croaring_4.3.11-1/get_patch
25+
patch_hash = ff26efa0b7e7bc24963e169ab1a4e15598fdfcb5f0b6db9f28eca9e26c22bb4a
26+
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/croaring_4.3.11-1/CRoaring-4.3.11.tar.gz
27+
wrapdb_version = 4.3.11-1
28+
29+
[provide]
30+
dependency_names = croaring

test/meson.build

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ iceberg_tests = {
6262
'string_util_test.cc',
6363
'visit_type_test.cc',
6464
),
65+
'roaring_test': files(
66+
'roaring_test.cc',
67+
)
6568
}
6669

6770
foreach test_name, sources : iceberg_tests

0 commit comments

Comments
 (0)