Skip to content

Commit 57bffa2

Browse files
committed
Case of nlohmann_json not being vendored
1 parent 5250790 commit 57bffa2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3596,6 +3596,8 @@ macro(build_google_cloud_cpp_storage)
35963596
add_dependencies(google_cloud_cpp_dependencies crc32c_fc)
35973597
if(NLOHMANN_JSON_VENDORED)
35983598
add_dependencies(google_cloud_cpp_dependencies nlohmann_json_fc)
3599+
else()
3600+
add_dependencies(google_cloud_cpp_dependencies nlohmann_json::nlohmann_json)
35993601
endif()
36003602

36013603
set(GOOGLE_CLOUD_CPP_STATIC_LIBRARY_STORAGE
@@ -4091,6 +4093,8 @@ macro(build_opentelemetry)
40914093
EXCLUDE_FROM_ALL OFF)
40924094
if(NLOHMANN_JSON_VENDORED)
40934095
add_dependencies(opentelemetry_dependencies nlohmann_json_fc)
4096+
else()
4097+
add_dependencies(google_cloud_cpp_dependencies nlohmann_json::nlohmann_json)
40944098
endif()
40954099

40964100
add_dependencies(opentelemetry_dependencies opentelemetry_proto_ep

0 commit comments

Comments
 (0)