Leonid Plyushch
5 years ago
2 changed files with 13 additions and 12 deletions
@ -1,24 +1,26 @@ |
|||||
--- ./CMakeLists.txt 2017-06-28 01:16:01.000000000 +0530
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
+++ ../CMakeLists.txt 2017-07-08 22:10:35.062570096 +0530
|
index f6de091a0c..d21e04a24d 100644
|
||||
@@ -272,7 +272,7 @@
|
--- a/CMakeLists.txt
|
||||
if(_gRPC_PLATFORM_MAC) |
+++ b/CMakeLists.txt
|
||||
set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m pthread) |
@@ -205,7 +205,7 @@ if(_gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_IOS)
|
||||
|
elseif(_gRPC_PLATFORM_ANDROID) |
||||
|
set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m) |
||||
elseif(UNIX) |
elseif(UNIX) |
||||
- set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} rt m pthread)
|
- set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} rt m pthread)
|
||||
+ set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m)
|
+ set(_gRPC_ALLTARGETS_LIBRARIES ${CMAKE_DL_LIBS} m)
|
||||
endif() |
endif() |
||||
|
|
||||
if(WIN32 AND MSVC) |
if(WIN32 AND MSVC) |
||||
@@ -813,12 +813,6 @@
|
@@ -1432,12 +1432,6 @@ target_link_libraries(gpr
|
||||
target_link_libraries(gpr |
absl::strings |
||||
${_gRPC_ALLTARGETS_LIBRARIES} |
absl::optional |
||||
) |
) |
||||
-if (_gRPC_PLATFORM_ANDROID)
|
-if(_gRPC_PLATFORM_ANDROID)
|
||||
- target_link_libraries(gpr
|
- target_link_libraries(gpr
|
||||
- android
|
- android
|
||||
- log
|
- log
|
||||
- )
|
- )
|
||||
-endif (_gRPC_PLATFORM_ANDROID)
|
-endif()
|
||||
|
|
||||
foreach(_hdr |
foreach(_hdr |
||||
include/grpc/support/alloc.h |
include/grpc/support/alloc.h |
||||
|
Loading…
Reference in new issue