Skip to content

Commit 960dbba

Browse files
koukou
committed
GH-40221: [C++][CMake] Use arrow/util/config.h.cmake instead of add_definitions()
It's easy to maintain.
1 parent 193e39c commit 960dbba

18 files changed

Lines changed: 38 additions & 51 deletions

‎cpp/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,6 @@ if(ARROW_USE_GLOG)
784784
if(GLOG_SOURCE STREQUAL "SYSTEM")
785785
list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS glog::glog)
786786
endif()
787-
add_definitions("-DARROW_USE_GLOG")
788787
endif()
789788
790789
if(ARROW_S3)
@@ -953,7 +952,6 @@ if(ARROW_JEMALLOC)
953952
endif()
954953
955954
if(ARROW_MIMALLOC)
956-
add_definitions(-DARROW_MIMALLOC)
957955
list(APPEND ARROW_SHARED_LINK_LIBS mimalloc::mimalloc)
958956
list(APPEND ARROW_STATIC_LINK_LIBS mimalloc::mimalloc)
959957
endif()

‎cpp/cmake_modules/ThirdpartyToolchain.cmake‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2585,7 +2585,6 @@ if(ARROW_WITH_RE2)
25852585
TRUE
25862586
PC_PACKAGE_NAMES
25872587
re2)
2588-
add_definitions(-DARROW_WITH_RE2)
25892588
endif()
25902589

25912590
macro(build_bzip2)
@@ -2693,7 +2692,6 @@ if(ARROW_WITH_UTF8PROC)
26932692
libutf8proc
26942693
REQUIRED_VERSION
26952694
"2.2.0")
2696-
add_definitions(-DARROW_WITH_UTF8PROC)
26972695
endif()
26982696

26992697
macro(build_cares)

‎cpp/src/arrow/CMakeLists.txt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -304,17 +304,14 @@ set_source_files_properties(vendored/datetime/tz.cpp
304304
add_definitions(-DURI_STATIC_BUILD)
305305

306306
if(ARROW_WITH_BROTLI)
307-
add_definitions(-DARROW_WITH_BROTLI)
308307
list(APPEND ARROW_SRCS util/compression_brotli.cc)
309308
endif()
310309

311310
if(ARROW_WITH_BZ2)
312-
add_definitions(-DARROW_WITH_BZ2)
313311
list(APPEND ARROW_SRCS util/compression_bz2.cc)
314312
endif()
315313

316314
if(ARROW_WITH_LZ4)
317-
add_definitions(-DARROW_WITH_LZ4)
318315
list(APPEND ARROW_SRCS util/compression_lz4.cc)
319316
endif()
320317

@@ -323,17 +320,14 @@ if(ARROW_WITH_OPENTELEMETRY)
323320
endif()
324321

325322
if(ARROW_WITH_SNAPPY)
326-
add_definitions(-DARROW_WITH_SNAPPY)
327323
list(APPEND ARROW_SRCS util/compression_snappy.cc)
328324
endif()
329325

330326
if(ARROW_WITH_ZLIB)
331-
add_definitions(-DARROW_WITH_ZLIB)
332327
list(APPEND ARROW_SRCS util/compression_zlib.cc)
333328
endif()
334329

335330
if(ARROW_WITH_ZSTD)
336-
add_definitions(-DARROW_WITH_ZSTD)
337331
list(APPEND ARROW_SRCS util/compression_zstd.cc)
338332
endif()
339333

@@ -493,10 +487,6 @@ if(ARROW_COMPUTE)
493487
endif()
494488

495489
if(ARROW_FILESYSTEM)
496-
if(ARROW_HDFS)
497-
add_definitions(-DARROW_HDFS)
498-
endif()
499-
500490
list(APPEND
501491
ARROW_SRCS
502492
filesystem/filesystem.cc

‎cpp/src/arrow/compute/kernels/scalar_string_ascii.cc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,18 @@
2121
#include <memory>
2222
#include <string>
2323

24-
#ifdef ARROW_WITH_RE2
25-
#include <re2/re2.h>
26-
#endif
27-
2824
#include "arrow/array/builder_nested.h"
2925
#include "arrow/compute/kernels/scalar_string_internal.h"
3026
#include "arrow/result.h"
27+
#include "arrow/util/config.h"
3128
#include "arrow/util/macros.h"
3229
#include "arrow/util/string.h"
3330
#include "arrow/util/value_parsing.h"
3431

32+
#ifdef ARROW_WITH_RE2
33+
#include <re2/re2.h>
34+
#endif
35+
3536
namespace arrow {
3637

3738
using internal::EndsWith;

‎cpp/src/arrow/compute/kernels/scalar_string_test.cc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@
2323
#include <gmock/gmock.h>
2424
#include <gtest/gtest.h>
2525

26-
#ifdef ARROW_WITH_UTF8PROC
27-
#include <utf8proc.h>
28-
#endif
29-
3026
#include "arrow/compute/api_scalar.h"
3127
#include "arrow/compute/exec.h"
3228
#include "arrow/compute/kernels/codegen_internal.h"
3329
#include "arrow/compute/kernels/test_util.h"
3430
#include "arrow/testing/gtest_util.h"
3531
#include "arrow/type.h"
3632
#include "arrow/type_fwd.h"
33+
#include "arrow/util/config.h"
3734
#include "arrow/util/value_parsing.h"
3835

36+
#ifdef ARROW_WITH_UTF8PROC
37+
#include <utf8proc.h>
38+
#endif
39+
3940
namespace arrow::compute {
4041

4142
// interesting utf8 characters for testing (lower case / upper case):

‎cpp/src/arrow/compute/kernels/scalar_string_utf8.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@
1919
#include <mutex>
2020
#include <string>
2121

22+
#include "arrow/compute/kernels/scalar_string_internal.h"
23+
#include "arrow/util/config.h"
24+
#include "arrow/util/utf8_internal.h"
25+
2226
#ifdef ARROW_WITH_UTF8PROC
2327
#include <utf8proc.h>
2428
#endif
2529

26-
#include "arrow/compute/kernels/scalar_string_internal.h"
27-
#include "arrow/util/utf8_internal.h"
28-
2930
namespace arrow {
3031
namespace compute {
3132
namespace internal {

‎cpp/src/arrow/ipc/feather_test.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "arrow/type.h"
3636
#include "arrow/util/checked_cast.h"
3737
#include "arrow/util/compression.h"
38+
#include "arrow/util/config.h"
3839

3940
namespace arrow {
4041

‎cpp/src/arrow/util/compression.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include "arrow/result.h"
2525
#include "arrow/status.h"
2626
#include "arrow/util/compression_internal.h"
27+
#include "arrow/util/config.h"
2728
#include "arrow/util/logging.h"
2829

2930
namespace arrow {

‎cpp/src/arrow/util/compression_benchmark.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#include "arrow/result.h"
2929
#include "arrow/util/compression.h"
30+
#include "arrow/util/config.h"
3031
#include "arrow/util/logging.h"
3132
#include "arrow/util/macros.h"
3233

‎cpp/src/arrow/util/compression_test.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "arrow/testing/gtest_util.h"
3131
#include "arrow/testing/util.h"
3232
#include "arrow/util/compression.h"
33+
#include "arrow/util/config.h"
3334

3435
namespace arrow {
3536
namespace util {
@@ -729,7 +730,7 @@ INSTANTIATE_TEST_SUITE_P(TestLZ4Frame, CodecTest,
729730
INSTANTIATE_TEST_SUITE_P(TestBrotli, CodecTest, ::testing::Values(Compression::BROTLI));
730731
#endif
731732

732-
#if ARROW_WITH_BZ2
733+
#ifdef ARROW_WITH_BZ2
733734
INSTANTIATE_TEST_SUITE_P(TestBZ2, CodecTest, ::testing::Values(Compression::BZ2));
734735
#endif
735736

0 commit comments

Comments
 (0)