Skip to content

Commit

Permalink
Fix C++ arrow build flag forwarding (#4921)
Browse files Browse the repository at this point in the history
Proper use of some parameters:
* ARROW_ASAN - shall be used instead of RERUN_USE_ASAN because otherwise
the property isn't set in MSVC configuration
* ARROW_CXXFLAGS - there was a typo with unnecessary D in the beginning

### What

### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [ ] I've included a screenshot or gif (if applicable)
* [ ] I have tested the web demo (if applicable):
* Using newly built examples:
[app.rerun.io](https://app.rerun.io/pr/4921/index.html)
* Using examples from latest `main` build:
[app.rerun.io](https://app.rerun.io/pr/4921/index.html?manifest_url=https://app.rerun.io/version/main/examples_manifest.json)
* Using full set of examples from `nightly` build:
[app.rerun.io](https://app.rerun.io/pr/4921/index.html?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json)
* [ ] The PR title and labels are set such as to maximize their
usefulness for the next release's CHANGELOG

- [PR Build Summary](https://build.rerun.io/pr/4921)
- [Docs
preview](https://rerun.io/preview/6d4898360122f63d3f5b7a83613853cc78985675/docs)
<!--DOCS-PREVIEW-->
- [Examples
preview](https://rerun.io/preview/6d4898360122f63d3f5b7a83613853cc78985675/examples)
<!--EXAMPLES-PREVIEW-->
- [Recent benchmark results](https://build.rerun.io/graphs/crates.html)
- [Wasm size tracking](https://build.rerun.io/graphs/sizes.html)
  • Loading branch information
rgolovanov authored Jan 26, 2024
1 parent 5b79998 commit acd699c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rerun_cpp/download_and_build_arrow.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ function(download_and_build_arrow)
-DARROW_BOOST_USE_SHARED=OFF
-DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED}
-DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC}
-DARROW_CXXFLAGS=${DARROW_CXXFLAGS}
-DARROW_CXXFLAGS=${ARROW_CXXFLAGS}
-DARROW_IPC=OFF
-DARROW_JEMALLOC=OFF # We encountered some build issues with jemalloc, use mimalloc instead.
-DARROW_MIMALLOC=ON
-DARROW_USE_ASAN=${RERUN_USE_ASAN}
-DARROW_USE_ASAN=${ARROW_ASAN}
-DARROW_USE_TSAN=OFF
-DARROW_USE_UBSAN=OFF
-DBOOST_SOURCE=BUNDLED
Expand Down

0 comments on commit acd699c

Please sign in to comment.