Skip to content

Commit 93883c5

Browse files
committed
ARROW-15066: [C++] Install nlohmann_json packages where necessary
1 parent bc6693c commit 93883c5

6 files changed

Lines changed: 6 additions & 2 deletions

File tree

‎ci/docker/debian-10-cpp.dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ RUN apt-get update -y -q && \
6262
llvm-${llvm}-dev \
6363
make \
6464
ninja-build \
65+
nlohmann-json3-dev \
6566
pkg-config \
6667
protobuf-compiler \
6768
python3-pip \

‎ci/docker/debian-11-cpp.dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ RUN apt-get update -y -q && \
6161
llvm-${llvm}-dev \
6262
make \
6363
ninja-build \
64+
nlohmann-json3-dev \
6465
pkg-config \
6566
protobuf-compiler-grpc \
6667
python3-pip \

‎ci/docker/fedora-33-cpp.dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ RUN dnf update -y && \
4444
gtest-devel \
4545
java-latest-openjdk-devel \
4646
java-latest-openjdk-headless \
47+
json \
4748
libzstd-devel \
4849
llvm-devel \
4950
llvm-static \

‎ci/docker/ubuntu-20.04-cpp.dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ RUN apt-get update -y -q && \
9393
libzstd-dev \
9494
make \
9595
ninja-build \
96+
nlohmann-json3-dev \
9697
pkg-config \
9798
protobuf-compiler \
9899
python3-pip \

‎ci/scripts/msys2_setup.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ case "${target}" in
4141
packages+=(${MINGW_PACKAGE_PREFIX}-make)
4242
packages+=(${MINGW_PACKAGE_PREFIX}-mlir)
4343
packages+=(${MINGW_PACKAGE_PREFIX}-ninja)
44+
packages+=(${MINGW_PACKAGE_PREFIX}-nlohmann-json)
4445
packages+=(${MINGW_PACKAGE_PREFIX}-polly)
4546
packages+=(${MINGW_PACKAGE_PREFIX}-protobuf)
4647
packages+=(${MINGW_PACKAGE_PREFIX}-python3-numpy)
@@ -67,7 +68,7 @@ case "${target}" in
6768
packages+=(${MINGW_PACKAGE_PREFIX}-gcc)
6869
packages+=(${MINGW_PACKAGE_PREFIX}-go)
6970
packages+=(${MINGW_PACKAGE_PREFIX}-toolchain)
70-
packages+=(base-devel)
71+
packages+=(base-devel)
7172
;;
7273
esac
7374

‎cpp/cmake_modules/ThirdpartyToolchain.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3783,7 +3783,6 @@ macro(build_nlohmann_json)
37833783
add_dependencies(nlohmann_json::nlohmann_json nlohmann_json_ep)
37843784
endmacro()
37853785
if(ARROW_WITH_NLOHMANN_JSON)
3786-
set(nlohmann_json_SOURCE "AUTO")
37873786
resolve_dependency(nlohmann_json)
37883787
get_target_property(nlohmann_json_INCLUDE_DIR nlohmann_json::nlohmann_json
37893788
INTERFACE_INCLUDE_DIRECTORIES)

0 commit comments

Comments
 (0)