Skip to content

Commit 5080f97

Browse files
fix: cmake-format and meson-fmt formatting issues
- Fix FIND_PACKAGE_ARGS formatting in IcebergThirdpartyToolchain.cmake - Fix file ordering in meson.build (util/file_io_util.cc) - Fix boolean expression formatting in meson.build (croaring_needs_static)
1 parent dae3fd6 commit 5080f97

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,7 @@ function(resolve_nanoarrow_dependency)
283283
${FC_DECLARE_COMMON_OPTIONS}
284284
URL ${NANOARROW_SOURCE_URL}
285285
URL_HASH "SHA256=${ICEBERG_NANOARROW_BUILD_SHA256_CHECKSUM}"
286-
FIND_PACKAGE_ARGS
287-
NAMES
288-
nanoarrow
289-
CONFIG)
286+
FIND_PACKAGE_ARGS NAMES nanoarrow CONFIG)
290287
fetchcontent_makeavailable(nanoarrow)
291288

292289
if(nanoarrow_SOURCE_DIR)

src/iceberg/meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ iceberg_sources = files(
122122
'update/update_statistics.cc',
123123
'util/bucket_util.cc',
124124
'util/content_file_util.cc',
125-
'util/file_io_util.cc',
126125
'util/conversions.cc',
127126
'util/decimal.cc',
127+
'util/file_io_util.cc',
128128
'util/gzip_internal.cc',
129129
'util/murmurhash3_internal.cc',
130130
'util/property_util.cc',
@@ -142,8 +142,8 @@ iceberg_sources = files(
142142
# CRoaring does not export symbols, so on Windows it must
143143
# be used as a static lib
144144
croaring_needs_static = (
145-
get_option('default_library') == 'static' or
146-
host_machine.system() == 'windows'
145+
get_option('default_library') == 'static'
146+
or host_machine.system() == 'windows'
147147
)
148148
croaring_dep = dependency('croaring', static: croaring_needs_static)
149149
nanoarrow_dep = dependency('nanoarrow')

0 commit comments

Comments
 (0)