Skip to content

GH-40221: [C++][CMake] Use arrow/util/config.h.cmake instead of add_definitions()#40222

Merged
kou merged 1 commit intoapache:mainfrom
kou:cpp-cmake-config-h
Feb 24, 2024
Merged

GH-40221: [C++][CMake] Use arrow/util/config.h.cmake instead of add_definitions()#40222
kou merged 1 commit intoapache:mainfrom
kou:cpp-cmake-config-h

Conversation

@kou
Copy link
Copy Markdown
Member

@kou kou commented Feb 24, 2024

Rationale for this change

It's easy to maintain.

What changes are included in this PR?

Use #cmakedefine in cpp/src/arrow/util/config.h.cmake and #include "arrow/util/config.h" instead of add_definition(...).

Are these changes tested?

Yes.

Are there any user-facing changes?

No.

@kou kou requested a review from wgtmac as a code owner February 24, 2024 03:02
@github-actions
Copy link
Copy Markdown

⚠️ GitHub issue #40221 has been automatically assigned in GitHub to PR creator.

@kou
Copy link
Copy Markdown
Member Author

kou commented Feb 24, 2024

@github-actions crossbow submit -g cpp -g r -g linux -g python -g r

@github-actions

This comment was marked as outdated.

@kou kou force-pushed the cpp-cmake-config-h branch from ac45e33 to 960dbba Compare February 24, 2024 08:32
@kou
Copy link
Copy Markdown
Member Author

kou commented Feb 24, 2024

@github-actions crossbow submit -g cpp -g r -g linux -g python -g r

@github-actions
Copy link
Copy Markdown

Revision: 960dbba

Submitted crossbow builds: ursacomputing/crossbow @ actions-5a2aea19a8

Task Status
almalinux-8-amd64 GitHub Actions
almalinux-8-arm64 GitHub Actions
almalinux-9-amd64 GitHub Actions
almalinux-9-arm64 GitHub Actions
amazon-linux-2023-amd64 GitHub Actions
amazon-linux-2023-arm64 GitHub Actions
centos-7-amd64 GitHub Actions
centos-8-stream-amd64 GitHub Actions
centos-8-stream-arm64 GitHub Actions
centos-9-stream-amd64 GitHub Actions
centos-9-stream-arm64 GitHub Actions
debian-bookworm-amd64 GitHub Actions
debian-bookworm-arm64 GitHub Actions
debian-bullseye-amd64 GitHub Actions
debian-bullseye-arm64 GitHub Actions
debian-trixie-amd64 GitHub Actions
debian-trixie-arm64 GitHub Actions
r-binary-packages GitHub Actions
test-alpine-linux-cpp GitHub Actions
test-build-cpp-fuzz GitHub Actions
test-conda-cpp GitHub Actions
test-conda-cpp-valgrind Azure
test-conda-python-3.10 GitHub Actions
test-conda-python-3.10-cython2 GitHub Actions
test-conda-python-3.10-hdfs-2.9.2 GitHub Actions
test-conda-python-3.10-hdfs-3.2.1 GitHub Actions
test-conda-python-3.10-pandas-latest GitHub Actions
test-conda-python-3.10-pandas-nightly GitHub Actions
test-conda-python-3.10-spark-v3.5.0 GitHub Actions
test-conda-python-3.10-substrait GitHub Actions
test-conda-python-3.11 GitHub Actions
test-conda-python-3.11-dask-latest GitHub Actions
test-conda-python-3.11-dask-upstream_devel GitHub Actions
test-conda-python-3.11-hypothesis GitHub Actions
test-conda-python-3.11-pandas-upstream_devel GitHub Actions
test-conda-python-3.11-spark-master GitHub Actions
test-conda-python-3.12 GitHub Actions
test-conda-python-3.8 GitHub Actions
test-conda-python-3.8-pandas-1.0 GitHub Actions
test-conda-python-3.8-spark-v3.5.0 GitHub Actions
test-conda-python-3.9 GitHub Actions
test-conda-python-3.9-pandas-latest GitHub Actions
test-cuda-cpp GitHub Actions
test-cuda-python GitHub Actions
test-debian-11-cpp-amd64 GitHub Actions
test-debian-11-cpp-i386 GitHub Actions
test-debian-11-python-3-amd64 Azure
test-debian-11-python-3-i386 GitHub Actions
test-fedora-39-cpp GitHub Actions
test-fedora-39-python-3 Azure
test-fedora-r-clang-sanitizer Azure
test-r-arrow-backwards-compatibility GitHub Actions
test-r-depsource-bundled Azure
test-r-depsource-system GitHub Actions
test-r-dev-duckdb GitHub Actions
test-r-devdocs GitHub Actions
test-r-gcc-11 GitHub Actions
test-r-gcc-12 GitHub Actions
test-r-install-local GitHub Actions
test-r-install-local-minsizerel GitHub Actions
test-r-library-r-base-latest Azure
test-r-linux-as-cran GitHub Actions
test-r-linux-rchk GitHub Actions
test-r-linux-valgrind Azure
test-r-minimal-build Azure
test-r-offline-maximal GitHub Actions
test-r-offline-minimal Azure
test-r-rhub-debian-gcc-devel-lto-latest Azure
test-r-rhub-debian-gcc-release-custom-ccache Azure
test-r-rhub-ubuntu-gcc-release-latest Azure
test-r-rstudio-r-base-4.1-opensuse153 Azure
test-r-rstudio-r-base-4.2-centos7-devtoolset-8 Azure
test-r-rstudio-r-base-4.2-focal Azure
test-r-ubuntu-22.04 GitHub Actions
test-r-versions GitHub Actions
test-ubuntu-20.04-cpp GitHub Actions
test-ubuntu-20.04-cpp-bundled GitHub Actions
test-ubuntu-20.04-cpp-minimal-with-formats GitHub Actions
test-ubuntu-20.04-cpp-thread-sanitizer GitHub Actions
test-ubuntu-20.04-python-3 Azure
test-ubuntu-22.04-cpp GitHub Actions
test-ubuntu-22.04-cpp-20 GitHub Actions
test-ubuntu-22.04-cpp-no-threading GitHub Actions
test-ubuntu-22.04-python-3 GitHub Actions
test-ubuntu-r-sanitizer Azure
ubuntu-focal-amd64 GitHub Actions
ubuntu-focal-arm64 GitHub Actions
ubuntu-jammy-amd64 GitHub Actions
ubuntu-jammy-arm64 GitHub Actions
ubuntu-noble-amd64 GitHub Actions
ubuntu-noble-arm64 GitHub Actions

Copy link
Copy Markdown
Member Author

@kou kou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@kou kou merged commit b8fff04 into apache:main Feb 24, 2024
@kou kou deleted the cpp-cmake-config-h branch February 24, 2024 22:05
@kou kou removed the awaiting committer review Awaiting committer review label Feb 24, 2024
@github-actions github-actions bot added the awaiting changes Awaiting changes label Feb 24, 2024
@conbench-apache-arrow
Copy link
Copy Markdown

After merging your PR, Conbench analyzed the 7 benchmarking runs that have been run so far on merge-commit b8fff04.

There were 2 benchmark results indicating a performance regression:

The full Conbench report has more details. It also includes information about 6 possible false positives for unstable benchmarks that are known to sometimes produce them.

mapleFU pushed a commit that referenced this pull request Mar 18, 2024
….cc (#40625)

### Rationale for this change

This is a follow-up of #40222. We need `#include arrow/util/config.h` for `ARROW_WITH_*`.

### What changes are included in this PR?

Add missing `#include`.

### Are these changes tested?

Yes.

### Are there any user-facing changes?

No.
* GitHub Issue: #40621

Authored-by: Sutou Kouhei <kou@clear-code.com>
Signed-off-by: mwish <anmmscs_maple@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant