diff options
| author |  apolcyn <apolcyn@google.com> | 2018-06-07 10:48:48 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-07 10:48:48 -0700 |
| commit | c09f7432c08704cac122bf4fa65122059c7726db (patch) | |
| tree | ce438b3f8d733f55e6f2569a694f31566ebdb8e9 | |
| parent | d7728cda51ee1249e88f7d20dec92435f8d33d53 (diff) | |
| parent | 18caf6d2feb884031a22fc7b5d23a084869f113a (diff) | |
Merge pull request #15665 from apolcyn/fix_windows_addr_sort_lnik
Make address sorting depend on the same base libs as grpc, for windows
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | templates/CMakeLists.txt.template | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index af56886cd9..71bebde5d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -700,6 +700,7 @@ target_include_directories(address_sorting ) target_link_libraries(address_sorting + ${_gRPC_BASELIB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} ) diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 06adb33739..435217bacd 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -35,7 +35,7 @@ def get_deps(target_dict): deps = [] - if target_dict.get('baselib', False): + if target_dict.get('baselib', False) or target_dict['name'] == 'address_sorting': deps.append("${_gRPC_BASELIB_LIBRARIES}") if target_dict.get('build', None) in ['protoc']: deps.append("${_gRPC_PROTOBUF_PROTOC_LIBRARIES}") |