Skip to content

Commit c35ce7a

Browse files
committed
Add nlohmann_json_fc dependency conditionally to NLOHMANN_JSON_VENDORED
1 parent 4676fed commit c35ce7a

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3594,7 +3594,9 @@ macro(build_google_cloud_cpp_storage)
35943594
add_dependencies(google_cloud_cpp_dependencies zlib_ep)
35953595
endif()
35963596
add_dependencies(google_cloud_cpp_dependencies crc32c_fc)
3597-
add_dependencies(google_cloud_cpp_dependencies nlohmann_json_fc)
3597+
if(NLOHMANN_JSON_VENDORED)
3598+
add_dependencies(google_cloud_cpp_dependencies nlohmann_json_fc)
3599+
endif()
35983600

35993601
set(GOOGLE_CLOUD_CPP_STATIC_LIBRARY_STORAGE
36003602
"${GOOGLE_CLOUD_CPP_INSTALL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}google_cloud_cpp_storage${CMAKE_STATIC_LIBRARY_SUFFIX}"
@@ -4087,8 +4089,11 @@ macro(build_opentelemetry)
40874089
CONFIGURE_COMMAND ""
40884090
INSTALL_COMMAND ""
40894091
EXCLUDE_FROM_ALL OFF)
4092+
if(NLOHMANN_JSON_VENDORED)
4093+
add_dependencies(opentelemetry_dependencies nlohmann_json_fc)
4094+
endif()
40904095

4091-
add_dependencies(opentelemetry_dependencies nlohmann_json_fc opentelemetry_proto_ep
4096+
add_dependencies(opentelemetry_dependencies opentelemetry_proto_ep
40924097
${ARROW_PROTOBUF_LIBPROTOBUF})
40934098

40944099
# Ensure vendored protobuf is installed before OpenTelemetry builds

0 commit comments

Comments
 (0)