From 980aa3a7d90bc82c90a7cdfd3e8993c901e3070b Mon Sep 17 00:00:00 2001
From: Chris Cummins <chrisc.101@gmail.com>
Date: Thu, 3 Mar 2022 12:42:17 +0000
Subject: [PATCH] Fix gRPC header include path.

---
 compiler_gym/util/GrpcStatusMacros.h | 2 +-
 external/external.cmake              | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/compiler_gym/util/GrpcStatusMacros.h b/compiler_gym/util/GrpcStatusMacros.h
index 341d86f05..0f222f80c 100644
--- a/compiler_gym/util/GrpcStatusMacros.h
+++ b/compiler_gym/util/GrpcStatusMacros.h
@@ -9,7 +9,7 @@
 #include <boost/current_function.hpp>
 
 #include "glog/logging.h"
-#include "include/grpcpp/grpcpp.h"
+#include "grpcpp/grpcpp.h"
 
 using grpc::Status;
 
diff --git a/external/external.cmake b/external/external.cmake
index feef0b346..3732e3711 100644
--- a/external/external.cmake
+++ b/external/external.cmake
@@ -174,8 +174,6 @@ if(COMPILER_GYM_GRPC_PROVIDER STREQUAL "internal")
   )
   FetchContent_MakeAvailable(grpc)
   set(_GRPC_CPP_PLUGIN_EXECUTABLE $<TARGET_FILE:grpc_cpp_plugin>)
-  #TODO(boian): remove this when GrpcStatusMacros.h uses the correct include path.
-  target_include_directories(grpc++ INTERFACE "${grpc_SOURCE_DIR}")
 else()
   find_package(gRPC REQUIRED)
   set(_GRPC_CPP_PLUGIN_EXECUTABLE $<TARGET_FILE:grpc::grpc_cpp_plugin>)