Skip to content

Commit bb0ee69

Browse files
committed
build gRPC from source
1 parent cc938d8 commit bb0ee69

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

CMakeLists.txt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if(WITH_OTLP_GRPC)
157157

158158
if(UNIX AND NOT APPLE AND NOT CYGWIN)
159159
# needed for running protoc as part of the opentelemetry-cpp build
160-
set(GRPC_LD_LIBRARY_PATH_ENV "-E env LD_LIBRARY_PATH=${GRPC_INSTALL_LIB_DIR}")
160+
set(GRPC_LD_LIBRARY_PATH_ENV "LD_LIBRARY_PATH=${GRPC_INSTALL_LIB_DIR}")
161161
endif()
162162

163163
if(WIN32)
@@ -287,8 +287,8 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
287287
set(OTEL_CPP_PATCH_CMD "")
288288
endif()
289289

290-
if(WIN32)
291-
# Windows use the default build command
290+
if(WIN32 OR APPLE)
291+
# Windows and Mac use the default build command
292292
# Note: examples are temporarily turned off (-DWITH_EXAMPLES=OFF) due to a build issue that is now fixed in #3284
293293
# Renable examples after pulling in the fix
294294
ExternalProject_Add(
@@ -304,7 +304,7 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
304304
INSTALL_COMMAND ${CMAKE_COMMAND} --install . --prefix ${OTEL_CPP_PREFIX} --config $<CONFIG>
305305
)
306306
else()
307-
# Non-Windows use a custom build command
307+
# Linux use a custom build command
308308
# Note: examples are temporarily turned off (-DWITH_EXAMPLES=OFF) due to a build issue that is now fixed in #3284
309309
# Renable examples after pulling in the fix
310310
ExternalProject_Add(
@@ -315,7 +315,7 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
315315
UPDATE_DISCONNECTED 1
316316
PATCH_COMMAND ${OTEL_CPP_PATCH_CMD}
317317
CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH} -DgRPC_DIR=${GRPC_INSTALL_LIB_DIR}/cmake/grpc -DWITH_ABI_VERSION_1=OFF -DWITH_ABI_VERSION_2=ON -DWITH_OTLP_HTTP=${WITH_OTLP_HTTP} -DWITH_OTLP_GRPC=${WITH_OTLP_GRPC} -DWITH_OTLP_FILE=${WITH_OTLP_FILE} -DWITH_EXAMPLES=OFF -DBUILD_TESTING=OFF -DWITH_BENCHMARK=OFF -DOPENTELEMETRY_INSTALL=ON -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_CXX_STANDARD=${OTEL_CPP_CXX_STANDARD} -DVCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR} ${TRIPLET_DEFINITIONS}
318-
BUILD_COMMAND ${CMAKE_COMMAND} ${GRPC_LD_LIBRARY_PATH_ENV} ${CMAKE_MAKE_PROGRAM}
318+
BUILD_COMMAND ${CMAKE_COMMAND} -E env ${GRPC_LD_LIBRARY_PATH_ENV} ${CMAKE_MAKE_PROGRAM}
319319
BUILD_BYPRODUCTS ${OTEL_CPP_LIBRARIES}
320320
INSTALL_DIR ${OTEL_CPP_PREFIX}
321321
INSTALL_COMMAND ${CMAKE_COMMAND} --install . --prefix ${OTEL_CPP_PREFIX} --config $<CONFIG>
@@ -347,9 +347,7 @@ if(WITH_OTLP_GRPC)
347347
find_package(absl REQUIRED)
348348
find_package(c-ares REQUIRED)
349349
find_package(re2 REQUIRED)
350-
if(WIN32)
351-
find_package(openssl REQUIRED)
352-
endif()
350+
find_package(OpenSSL REQUIRED COMPONENTS SSL Crypto)
353351
endif()
354352

355353
set(TRACE_API_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/api/trace/include)

0 commit comments

Comments
 (0)