feat: Add support for Meson build system #233
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -461,7 +461,7 @@ function(resolve_cpr_dependency) | |
| set(CPR_VENDORED TRUE) | ||
| set_target_properties(cpr PROPERTIES OUTPUT_NAME "iceberg_vendored_cpr" | ||
| POSITION_INDEPENDENT_CODE ON) | ||
| add_library(iceberg::cpr ALIAS cpr) | ||
| install(TARGETS cpr | ||
| EXPORT iceberg_targets | ||
| RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}" | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,9 +22,9 @@ project(example) | |
|
|
||
| set(CMAKE_CXX_STANDARD 23) | ||
|
|
||
| find_package(iceberg CONFIG REQUIRED) | ||
|
|
||
| add_executable(demo_example demo_example.cc) | ||
|
|
||
| target_link_libraries(demo_example PRIVATE iceberg::iceberg_bundle_static | ||
| iceberg::iceberg_rest_static) | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| project( | ||
| 'iceberg', | ||
| 'cpp', | ||
| version: '0.2.0', | ||
| license: 'Apache-2.0', | ||
| meson_version: '>=1.3.0', | ||
| default_options: [ | ||
| 'cpp_std=c++23,c++latest', | ||
| 'warning_level=2', | ||
| # Don't build any tests for curl | ||
| 'curl:tests=disabled', | ||
| 'curl:unittests=disabled', | ||
| ], | ||
| ) | ||
|
|
||
| subdir('src') | ||
|
|
||
| install_data( | ||
| ['LICENSE', 'NOTICE'], | ||
| install_dir: get_option('datadir') / 'doc/iceberg', | ||
| ) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| # Many of the options that CMake provides do not need to be implemented | ||
| # in this configuration, as Meson offers built-in support for them. | ||
| # For instance, instead of ICEBERG_BUILD_STATIC and ICEBERG_BUILD_SHARED | ||
| # you can pass the `--default_library=<option>` to the meson setup command, | ||
| # where <option> is one of "shared", "static", or "both" | ||
| # | ||
| # ICEBERG_ENABLE_ASAN / ICEBERG_ENABLE_UBSAN can be specified with | ||
| # the -Db_sanitize=address,undefined option. Starting in Meson 1.8, | ||
| # you can provide any array of sanitizers to that same argument, | ||
| # including for example the "fuzzing" option | ||
| # | ||
| # ICEBERG_INSTALL_LIBDIR / ICEBERG_INSTALL_BINDIR / ICEBERG_INSTALL_INCLUDEDIR | ||
| # and ICEBERG_INSTALL_DOCDIR correspond to Meson's --libdir / --bindir / | ||
| # --includedir / --datadir arguments, respectively | ||
|
|
||
| option( | ||
| 'rest', | ||
| type: 'feature', | ||
| description: 'Build rest catalog client', | ||
| value: 'enabled', | ||
| ) | ||
| option('tests', type: 'feature', description: 'Build tests', value: 'enabled') | ||
|
There was a problem hiding this comment. Do we need to add other CMake options? There was a problem hiding this comment. Options like ICEBERG_BUILD_STATIC and ICEBERG_BUILD_SHARED won't be here - Meson has built-in support for generating shared, static, or both libraries via the meson setup ... --default_library=staticICEBERG_ENABLE_ASAN / ICEBERG_ENABLE_UBSAN are similar in that Meson has a built-in command like argument for sanitizers. To enable both of those, you would do: meson setup ... -Db_sanitize=address,undefined(you can also supply other sanitizers like ICEBERG_INSTALL_LIBDIR / ICEBERG_INSTALL_BINDIR / ICEBERG_INSTALL_INCLUDEDIR have corresponding CLI arguments of --libdir / --bindir / --includedir. I haven't looked closely at what ICEBERG_INSTALL_DOCDIR is but I assume that maps to Meson's --datadir ICEBERG_BUILD_REST I will add when I get this PR up to speed with recent changes. If there's any other option let me know There was a problem hiding this comment. Perhaps adding these as comments to this file so impatient developers do not need to do research by themselves? |
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,16 +83,16 @@ list(APPEND | |
| ZLIB::ZLIB) | ||
| list(APPEND | ||
| ICEBERG_STATIC_INSTALL_INTERFACE_LIBS | ||
| "$<IF:$<BOOL:${NANOARROW_VENDORED}>,iceberg::nanoarrow_static,$<IF:$<TARGET_EXISTS:nanoarrow::nanoarrow_static>,nanoarrow::nanoarrow_static,nanoarrow::nanoarrow_shared>>" | ||
| "$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,iceberg::nlohmann_json,$<IF:$<TARGET_EXISTS:nlohmann_json::nlohmann_json>,nlohmann_json::nlohmann_json,nlohmann_json::nlohmann_json>>" | ||
| "$<IF:$<BOOL:${CROARING_VENDORED}>,iceberg::roaring,roaring::roaring>" | ||
| "$<IF:$<BOOL:${SPDLOG_VENDORED}>,iceberg::spdlog,spdlog::spdlog>") | ||
| list(APPEND | ||
| ICEBERG_SHARED_INSTALL_INTERFACE_LIBS | ||
| "$<IF:$<BOOL:${NANOARROW_VENDORED}>,iceberg::nanoarrow_shared,$<IF:$<TARGET_EXISTS:nanoarrow::nanoarrow_shared>,nanoarrow::nanoarrow_shared,nanoarrow::nanoarrow_static>>" | ||
| "$<IF:$<BOOL:${NLOHMANN_JSON_VENDORED}>,iceberg::nlohmann_json,$<IF:$<TARGET_EXISTS:nlohmann_json::nlohmann_json>,nlohmann_json::nlohmann_json,nlohmann_json::nlohmann_json>>" | ||
| "$<IF:$<BOOL:${CROARING_VENDORED}>,iceberg::roaring,roaring::roaring>" | ||
| "$<IF:$<BOOL:${SPDLOG_VENDORED}>,iceberg::spdlog,spdlog::spdlog>") | ||
|
|
||
| add_iceberg_lib(iceberg | ||
| SOURCES | ||
|
|
@@ -106,7 +106,9 @@ add_iceberg_lib(iceberg | |
| STATIC_INSTALL_INTERFACE_LIBS | ||
| ${ICEBERG_STATIC_INSTALL_INTERFACE_LIBS} | ||
| SHARED_INSTALL_INTERFACE_LIBS | ||
| ${ICEBERG_SHARED_INSTALL_INTERFACE_LIBS} | ||
| OUTPUTS | ||
| ICEBERG_LIBRARIES) | ||
|
|
||
| iceberg_install_all_headers(iceberg) | ||
|
|
||
|
|
@@ -115,9 +117,6 @@ add_subdirectory(expression) | |
| add_subdirectory(row) | ||
| add_subdirectory(util) | ||
|
|
||
| if(ICEBERG_BUILD_BUNDLE) | ||
| set(ICEBERG_BUNDLE_SOURCES | ||
| arrow/arrow_fs_file_io.cc | ||
|
|
@@ -156,17 +155,17 @@ if(ICEBERG_BUILD_BUNDLE) | |
|
|
||
| list(APPEND | ||
| ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS | ||
| "$<IF:$<TARGET_EXISTS:iceberg::iceberg_static>,iceberg::iceberg_static,iceberg::iceberg_shared>" | ||
| "$<IF:$<BOOL:${ARROW_VENDORED}>,iceberg::arrow_static,$<IF:$<TARGET_EXISTS:Arrow::arrow_static>,Arrow::arrow_static,Arrow::arrow_shared>>" | ||
| "$<IF:$<BOOL:${ARROW_VENDORED}>,iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_static>,Parquet::parquet_static,Parquet::parquet_shared>>" | ||
| "$<IF:$<BOOL:${AVRO_VENDORED}>,iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_static>,avro-cpp::avrocpp_static,avro-cpp::avrocpp_shared>>" | ||
| ) | ||
| list(APPEND | ||
| ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS | ||
| "$<IF:$<TARGET_EXISTS:iceberg::iceberg_shared>,iceberg::iceberg_shared,iceberg::iceberg_static>" | ||
| "$<IF:$<BOOL:${ARROW_VENDORED}>,iceberg::arrow_static,$<IF:$<TARGET_EXISTS:Arrow::arrow_shared>,Arrow::arrow_shared,Arrow::arrow_static>>" | ||
| "$<IF:$<BOOL:${ARROW_VENDORED}>,iceberg::parquet_static,$<IF:$<TARGET_EXISTS:Parquet::parquet_shared>,Parquet::parquet_shared,Parquet::parquet_static>>" | ||
| "$<IF:$<BOOL:${AVRO_VENDORED}>,iceberg::avrocpp_s,$<IF:$<TARGET_EXISTS:avro-cpp::avrocpp_shared>,avro-cpp::avrocpp_shared,avro-cpp::avrocpp_static>>" | ||
| ) | ||
|
|
||
| add_iceberg_lib(iceberg_bundle | ||
|
|
@@ -179,17 +178,16 @@ if(ICEBERG_BUILD_BUNDLE) | |
| STATIC_INSTALL_INTERFACE_LIBS | ||
| ${ICEBERG_BUNDLE_STATIC_INSTALL_INTERFACE_LIBS} | ||
| SHARED_INSTALL_INTERFACE_LIBS | ||
| ${ICEBERG_BUNDLE_SHARED_INSTALL_INTERFACE_LIBS} | ||
| OUTPUTS | ||
| ICEBERG_BUNDLE_LIBRARIES) | ||
|
There was a problem hiding this comment. We need same logic to add There was a problem hiding this comment. Should be handled by the |
||
|
|
||
| add_subdirectory(arrow) | ||
| add_subdirectory(avro) | ||
| add_subdirectory(parquet) | ||
| endif() | ||
|
|
||
| iceberg_install_cmake_package(iceberg iceberg_targets) | ||
|
|
||
| if(ICEBERG_BUILD_TESTS) | ||
| add_subdirectory(test) | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| install_headers(['in_memory_catalog.h'], subdir: 'iceberg/catalog/memory') |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| subdir('memory') | ||
|
|
||
| if get_option('rest').enabled() | ||
| subdir('rest') | ||
| endif |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,12 +28,12 @@ list(APPEND ICEBERG_REST_SHARED_BUILD_INTERFACE_LIBS | |
| "$<IF:$<TARGET_EXISTS:iceberg_shared>,iceberg_shared,iceberg_static>" cpr::cpr) | ||
| list(APPEND | ||
| ICEBERG_REST_STATIC_INSTALL_INTERFACE_LIBS | ||
| "$<IF:$<TARGET_EXISTS:iceberg::iceberg_static>,iceberg::iceberg_static,iceberg::iceberg_shared>" | ||
| "$<IF:$<BOOL:${CPR_VENDORED}>,iceberg::cpr,cpr::cpr>") | ||
| list(APPEND | ||
| ICEBERG_REST_SHARED_INSTALL_INTERFACE_LIBS | ||
| "$<IF:$<TARGET_EXISTS:iceberg::iceberg_shared>,iceberg::iceberg_shared,iceberg::iceberg_static>" | ||
| "$<IF:$<BOOL:${CPR_VENDORED}>,iceberg::cpr,cpr::cpr>") | ||
|
|
||
| add_iceberg_lib(iceberg_rest | ||
| SOURCES | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.