This is an archive of the discontinued LLVM Phabricator instance.

Differential D95574

[OpenMP][Libomptarget] Fix conditional in CMake for remote plugin
ClosedPublic

Authored by atmnpatel on Jan 27 2021, 3:53 PM.

Details

Reviewers
jdoerfert
JonChesterfield
tianshilei1992
Commits
rG8a77056256d9: [OpenMP][Libomptarget] Fix conditional in CMake for remote plugin
Summary

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.

Diff Detail

Event Timeline

atmnpatel created this revision.Jan 27 2021, 3:53 PM
Herald added subscribers: guansong, yaxunl, mgorny. · View Herald TranscriptJan 27 2021, 3:53 PM
atmnpatel requested review of this revision.Jan 27 2021, 3:53 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 27 2021, 3:53 PM
Herald added subscribers: openmp-commits, sstefan1. · View Herald Transcript
Harbormaster completed remote builds in B86925: Diff 319703.Jan 27 2021, 4:34 PM
jdoerfert accepted this revision.Jan 27 2021, 5:13 PM

LG

This revision is now accepted and ready to land.Jan 27 2021, 5:13 PM
jdoerfert added a comment.Jan 27 2021, 5:13 PM

please add to the backport list

Closed by commit rG8a77056256d9: [OpenMP][Libomptarget] Fix conditional in CMake for remote plugin (authored by adpatel6). · Explain WhyJan 27 2021, 6:29 PM
This revision was automatically updated to reflect the committed changes.
adpatel6 added a commit: rG8a77056256d9: [OpenMP][Libomptarget] Fix conditional in CMake for remote plugin.

Revision Contents

PathSize
openmp/
libomptarget/
plugins/
remote/
11 lines

Diff 319731

openmp/libomptarget/plugins/remote/CMakeLists.txt

Show All 36 Linesif (Protobuf_FOUND AND gRPC_FOUND AND PROTOC AND GRPC_CPP_PLUGIN)
set(GRPC_SRC_FILES set(GRPC_SRC_FILES
${directory}/openmp.grpc.pb.cc ${directory}/openmp.grpc.pb.cc
${directory}/openmp.pb.cc ${directory}/openmp.pb.cc
) )
set(GRPC_INCLUDE_DIR set(GRPC_INCLUDE_DIR
${directory} ${directory}
) )
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_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/)
set(RPC_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/) set(RPC_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(server) add_subdirectory(server)
else()
libomptarget_say("Not building remote offloading plugin: required libraries were not found.")
endif()