From 254dda658e8c4c668eb5a1bfa8b5faecae1e3e1e Mon Sep 17 00:00:00 2001
From: Ryan Burn <ryan.burn@gmail.com>
Date: Wed, 2 May 2018 16:46:27 -0400
Subject: [PATCH 1/3] Bump version.

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1364c077..88f1908d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,8 @@ project(lightstep-tracer)
 # Version information
 
 set(LIGHTSTEP_VERSION_MAJOR "0")
-set(LIGHTSTEP_VERSION_MINOR "6")
-set(LIGHTSTEP_VERSION_PATCH "1")
+set(LIGHTSTEP_VERSION_MINOR "7")
+set(LIGHTSTEP_VERSION_PATCH "0")
 set(LIGHTSTEP_VERSION_STRING
   "${LIGHTSTEP_VERSION_MAJOR}.${LIGHTSTEP_VERSION_MINOR}.${LIGHTSTEP_VERSION_PATCH}")
 

From 463e14883f167894d9f72d712c58d8949d697f8d Mon Sep 17 00:00:00 2001
From: Ryan Burn <ryan.burn@gmail.com>
Date: Sat, 15 Sep 2018 20:09:54 -0700
Subject: [PATCH 2/3] Add support for finding gRPC via cmake.

---
 CMakeLists.txt | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 88f1908d..4e546a56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,15 +112,24 @@ set(LIGHTSTEP_LINK_LIBRARIES ${OPENTRACING_LIBRARY}
                              ${PROTOBUF_LIBRARIES})
 
 if (WITH_GRPC)                           
-  find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
-  if (NOT GRPC_CPP_PLUGIN)
-    message(FATAL_ERROR "grpc_cpp_plugin not found!")
+  find_package(gRPC CONFIG)
+  # First attempt to set up gRPC via cmake; but if cmake config files aren't
+  # available, fallback to pkg-config.
+  if (gRPC_FOUND)
+    set(GRPC_CPP_PLUGIN $<TARGET_FILE:gRPC::grpc_cpp_plugin>)
+    list(APPEND LIGHTSTEP_LINK_LIBRARIES gRPC::grpc++)
+  else()
+    message("Falling back to finding gRPC with pkg-config")
+    find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
+    if (NOT GRPC_CPP_PLUGIN)
+      message(FATAL_ERROR "grpc_cpp_plugin not found!")
+    endif()
+    find_package(PkgConfig REQUIRED)
+    pkg_search_module(GRPC REQUIRED grpc)
+    pkg_search_module(GRPCPP REQUIRED grpc++)
+    list(APPEND LIGHTSTEP_LINK_LIBRARIES ${GRPCPP_LDFLAGS} ${GRPC_LDFLAGS})  
+    include_directories(SYSTEM ${GRPC_INCLUDE_DIRS} ${GRPCPP_INCLUDE_DIRS})
   endif()
-  find_package(PkgConfig REQUIRED)
-  pkg_search_module(GRPC REQUIRED grpc)
-  pkg_search_module(GRPCPP REQUIRED grpc++)
-  list(APPEND LIGHTSTEP_LINK_LIBRARIES ${GRPCPP_LDFLAGS} ${GRPC_LDFLAGS})  
-  include_directories(SYSTEM ${GRPC_INCLUDE_DIRS} ${GRPCPP_INCLUDE_DIRS})
 endif()
 
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)

From acde3ba30e7a49b4fb8d00456e014cb001625522 Mon Sep 17 00:00:00 2001
From: Ryan Burn <ryan.burn@gmail.com>
Date: Mon, 17 Sep 2018 16:14:03 -0700
Subject: [PATCH 3/3] Add missing include.

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ec343b5..019b2ed4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,6 +120,8 @@ if (WITH_GRPC)
   if (gRPC_FOUND)
     set(GRPC_CPP_PLUGIN $<TARGET_FILE:gRPC::grpc_cpp_plugin>)
     list(APPEND LIGHTSTEP_LINK_LIBRARIES gRPC::grpc++)
+    include_directories(SYSTEM
+          $<TARGET_PROPERTY:gRPC::grpc++,INTERFACE_INCLUDE_DIRECTORIES>)
   else()
     message("Falling back to finding gRPC with pkg-config")
     find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)