Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

grpc: fix cross-build + provide all CMake executable imported targets + add shared option + modernize #9044

Merged
merged 18 commits into from
Feb 21, 2022
Merged

grpc: fix cross-build + provide all CMake executable imported targets + add shared option + modernize #9044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d3589a4
modernize
SpaceIm Jan 23, 2022
cc76923
provide all CMake executables targets
SpaceIm Jan 23, 2022
f137a46
fix cross-build & patch in build() instead of source()
SpaceIm Jan 23, 2022
7aac87f
fix test package
SpaceIm Jan 23, 2022
000c2f0
simplify test package
SpaceIm Jan 23, 2022
7adc97c
add shared option
SpaceIm Jan 23, 2022
0d577a4
do not test shared if cross-building
SpaceIm Jan 23, 2022
d2fdd2d
fix cross-build to iOS
SpaceIm Jan 23, 2022
f007883
handle codegen option in package_info()
SpaceIm Jan 25, 2022
132d924
secure option doesn't affect package_id
SpaceIm Jan 25, 2022
c317ae7
drop shared with libstdc++/libstdc++11 for the moment
SpaceIm Jan 25, 2022
d76a8e5
test package: help gprc_cpp_plugin to find grpc_plugin_support if sha…
SpaceIm Jan 25, 2022
35ee36f
handle cross-build in test package
SpaceIm Jan 25, 2022
8ca92e4
typo
SpaceIm Jan 25, 2022
54005a2
gRPC shared buils fine with clang on Linux
SpaceIm Jan 26, 2022
33f41fb
fix install of plugins if cross-building
SpaceIm Jan 27, 2022
d15c963
with gcc allow grpc shared if abseil shared
SpaceIm Jan 27, 2022
065d579
really use @relative_path@
SpaceIm Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes/grpc/all/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 2.8.12)
project(cmake_wrapper)

include(conanbuildinfo.cmake)
conan_basic_setup()
conan_basic_setup(KEEP_RPATHS)

add_subdirectory("source_subfolder")
18 changes: 0 additions & 18 deletions recipes/grpc/all/cmake/grpc_cpp_plugin.cmake
View file
Open in desktop

This file was deleted.

31 changes: 31 additions & 0 deletions recipes/grpc/all/cmake/grpc_plugin_template.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
if(NOT TARGET @target_name@)
if(CMAKE_CROSSCOMPILING)
find_program(@find_program_variable@
NAMES @executable_name@
PATHS ENV PATH
NO_DEFAULT_PATH
)
else()
find_program(@find_program_variable@
NAMES @executable_name@
PATHS "${CMAKE_CURRENT_LIST_DIR}/@relative_path@bin/"
NO_DEFAULT_PATH
)
endif()
# TODO: In conan v2 with CMakeToolchain, can be replaced by:
# find_program(@find_program_variable@ NAMES @executable_name@))
# # Nice enough to handle grpc not in build_requires for native build
# if(NOT @find_program_variable@ AND NOT CMAKE_CROSSCOMPILING)
# find_program(@find_program_variable@
# NAMES @executable_name@
# PATHS "${CMAKE_CURRENT_LIST_DIR}/@relative_path@bin/"
# NO_DEFAULT_PATH
# )
# endif()

if(@find_program_variable@)
get_filename_component(@find_program_variable@ "${@find_program_variable@}" ABSOLUTE)
add_executable(@target_name@ IMPORTED)
set_property(TARGET @target_name@ PROPERTY IMPORTED_LOCATION ${@find_program_variable@})
endif()
endif()
Loading