Skip to content

Commit c9a398f

Browse files
committed
clean up for installing grpc runtime
1 parent 8ae6a19 commit c9a398f

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

CMakeLists.txt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -682,11 +682,11 @@ install(FILES ${OPENTELEMETRY_PROXY_RUNTIME_LIBRARIES} DESTINATION ${DEPENDENT_R
682682
if(UNIX)
683683
if(WITH_OTLP_GRPC)
684684
# Uniform version numbers for most files
685-
set(FULL_VERSION "41.0.0")
686-
set(SHORT_VERSION "41")
685+
set(GRPC_FULL_VERSION "41.0.0")
686+
set(GRPC_SHORT_VERSION "41")
687687

688688
# Loop through all base names (no version numbers here)
689-
foreach(base IN ITEMS
689+
foreach(grpcfile IN ITEMS
690690
libaddress_sorting
691691
libgpr
692692
libgrpc
@@ -698,13 +698,18 @@ if(UNIX)
698698
libupb_textformat_lib
699699
libutf8_range_lib
700700
)
701-
install_and_shorten_version(${base} ${FULL_VERSION} ${SHORT_VERSION})
701+
install_and_shorten_version(${grpcfile} ${GRPC_FULL_VERSION} ${GRPC_SHORT_VERSION})
702702
endforeach()
703703

704704
# Handle libgrpc++ separately (different version scheme)
705705
set(GRPCPP_FULL_VERSION "1.64.2")
706706
set(GRPCPP_SHORT_VERSION "1.64")
707-
install_and_shorten_version(libgrpc++ ${GRPCPP_FULL_VERSION} ${GRPCPP_SHORT_VERSION})
707+
foreach(grpcppfile IN ITEMS
708+
libgrpc++
709+
libgrpc++_unsecure
710+
)
711+
install_and_shorten_version(${grpcppfile} ${GRPCPP_FULL_VERSION} ${GRPCPP_SHORT_VERSION})
712+
endforeach()
708713
endif()
709714

710715
# Move any shared libraries to platform specific directories, so that they won't overwrite each other

0 commit comments

Comments
 (0)