From 5de347855a5e283d1bfb123d9bc08dc4e53ccff1 Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Fri, 19 Jan 2018 14:48:19 -0800 Subject: Reorganize cmake rules for address sorting; also fix merge conflict Fix clang-tide issue --- templates/CMakeLists.txt.template | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'templates/CMakeLists.txt.template') 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) - set(_gRPC_ADDRESS_SORTING_LIBRARIES address_sorting) + include(cmake/address_sorting.cmake) if(NOT MSVC) set(CMAKE_C_FLAGS "<%text>${CMAKE_C_FLAGS} -std=c99") @@ -379,7 +377,7 @@ PRIVATE <%text>${_gRPC_BENCHMARK_INCLUDE_DIR} PRIVATE <%text>${_gRPC_CARES_INCLUDE_DIR} PRIVATE <%text>${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE <%text>${CMAKE_CURRENT_BINARY_DIR}/third_party/address_sorting + PRIVATE <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} % 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} PRIVATE <%text>${_gRPC_CARES_INCLUDE_DIR} PRIVATE <%text>${_gRPC_GFLAGS_INCLUDE_DIR} - PRIVATE <%text>${CMAKE_CURRENT_BINARY_DIR}/third_party/address_sorting + PRIVATE <%text>${_gRPC_ADDRESS_SORTING_INCLUDE_DIR} % if tgt.build in ['test', 'private'] and tgt.language == 'c++': PRIVATE third_party/googletest/googletest/include PRIVATE third_party/googletest/googletest -- cgit v1.2.3