From 12b6579b79dc21e9e54e74520ece0d571a640d4b Mon Sep 17 00:00:00 2001 From: Atmn Patel Date: Wed, 27 Jan 2021 18:49:41 -0500 Subject: [PATCH] [OpenMP][Libomptarget] Fix conditional in CMake for remote plugin The remote offloading plugin's CMakeLists was trying to build if its flag was enabled even if it didn't find gRPC/protobuf. The conditional was wrong, it's fixed by this. Differential Revision: https://reviews.llvm.org/D95574 (cherry picked from commit 8a77056256d9970387595a5c729d894e3fe07131) --- openmp/libomptarget/plugins/remote/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/openmp/libomptarget/plugins/remote/CMakeLists.txt b/openmp/libomptarget/plugins/remote/CMakeLists.txt index 1baa1125f44ca8..989c74642c66e1 100644 --- a/openmp/libomptarget/plugins/remote/CMakeLists.txt +++ b/openmp/libomptarget/plugins/remote/CMakeLists.txt @@ -42,12 +42,13 @@ if (Protobuf_FOUND AND gRPC_FOUND AND PROTOC AND GRPC_CPP_PLUGIN) set(GRPC_INCLUDE_DIR ${directory} ) + + set(RPC_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/) + set(RPC_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/) + + add_subdirectory(src) + add_subdirectory(server) else() libomptarget_say("Not building remote offloading plugin: required libraries were not found.") endif() -set(RPC_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/) -set(RPC_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/) - -add_subdirectory(src) -add_subdirectory(server)