diff options
| author |  Alexander Polcyn <apolcyn@google.com> | 2018-01-19 14:48:19 -0800 |
|---|---|---|
| committer | Alexander Polcyn <apolcyn@google.com> | 2018-03-20 23:51:23 -0700 |
| commit | 5de347855a5e283d1bfb123d9bc08dc4e53ccff1 (patch) | |
| tree | b27872ec97308bed8dbcc92dc8fc91d9fa1b0a13 /templates | |
| parent | d21ee150765c73876992bbf06c716b4600ba047f (diff) | |
Reorganize cmake rules for address sorting; also fix merge conflict
Fix clang-tide issue
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/CMakeLists.txt.template | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index ec09203ca1..01fe569c2b 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -166,9 +166,7 @@ include(cmake/ssl.cmake) include(cmake/gflags.cmake) include(cmake/benchmark.cmake) - - include_directories(<%text>${CMAKE_CURRENT_SOURCE_DIR}/third_party/address_sorting</%text>) - set(_gRPC_ADDRESS_SORTING_LIBRARIES address_sorting) + include(cmake/address_sorting.cmake) if(NOT MSVC) set(CMAKE_C_FLAGS "<%text>${CMAKE_C_FLAGS}</%text> -std=c99") @@ -379,7 +377,7 @@ PRIVATE <%text>${_gRPC_BENCHMARK_INCLUDE_DIR}</%text> PRIVATE <%text>${_gRPC_CARES_INCLUDE_DIR}</%text> PRIVATE <%text>${_gRPC_GFLAGS_INCLUDE_DIR}</%text> - PRIVATE <%text>${CMAKE_CURRENT_BINARY_DIR}</%text>/third_party/address_sorting + PRIVATE <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}</%text> % if lib.build in ['test', 'private'] and lib.language == 'c++': PRIVATE third_party/googletest/googletest/include PRIVATE third_party/googletest/googletest @@ -460,7 +458,7 @@ PRIVATE <%text>${_gRPC_BENCHMARK_INCLUDE_DIR}</%text> PRIVATE <%text>${_gRPC_CARES_INCLUDE_DIR}</%text> PRIVATE <%text>${_gRPC_GFLAGS_INCLUDE_DIR}</%text> - PRIVATE <%text>${CMAKE_CURRENT_BINARY_DIR}</%text>/third_party/address_sorting + PRIVATE <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}</%text> % if tgt.build in ['test', 'private'] and tgt.language == 'c++': PRIVATE third_party/googletest/googletest/include PRIVATE third_party/googletest/googletest |