Reorganize cmake rules for address sorting; also fix merge conflict

Fix clang-tide issue

1 files changed, 16 insertions, 0 deletions

diff --git a/cmake/address_sorting.cmake b/cmake/address_sorting.cmake
new file mode 100644
index 0000000000..fd8cda7cdf
--- /dev/null
+++ b/cmake/address_sorting.cmake
@@ -0,0 +1,16 @@
+# Copyright 2017 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set(_gRPC_ADDRESS_SORTING_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/address_sorting")
+set(_gRPC_ADDRESS_SORTING_LIBRARIES address_sorting)