Commit Graph

79 Commits

Author SHA1 Message Date
Jan Tattermusch 3fde13929b
Switch to protobuf's /CMakeLists.txt instead of /cmake/CMakeLists.txt (#32678)
Try to react to https://github.com/protocolbuffers/protobuf/issues/12263
and https://github.com/protocolbuffers/protobuf/pull/12295

Protobuf's /cmake/CMakeLists.txt is now deprecated if favor of
/CMakeLists.txt


58ecf38aa5/cmake/CMakeLists.txt (L3)

In this PR:
- Adjust `cmake/protobuf.cmake` to use the right CMakeLists.txt
- adjust the C++ distribtests accordingly
2023-03-22 09:14:04 -07:00
Ben Beasley c641b82515
Use CMake variables for paths in pkg-config files (#31671)
Use @gRPC_INSTALL_LIBDIR@ for libdir; this fixes an incorrect
-L/usr/lib on multilib Linux systems where that is the 32-bit library
path and the correct path is /usr/lib64.

Use @gRPC_INSTALL_INCLUDEDIR@ for consistency.
2023-01-17 12:51:11 -08:00
Andres Beltran 2904ee8fd3
Add support for systemd socket activation (#31667)
* Revert "Revert "Add support for systemd socket activation (#30485)" (#31617)"

This reverts commit 867dc6cae2.

* Add checks to unix tests

* Ran generate_projects.sh and fixed styling in test

* Fix variable in unit test

* Use reinterpret_cast in test

* Rebase and fix sanity failures
2023-01-05 14:53:33 -08:00
Esun Kim 5fb4c2364d
Clean-up pkgconfig (#31660)
* Clean-up pkgconfig

* Removed run_distrib_test_cmake_module_install_pkgconfig.sh

* Proper re2

* Clean up pkgconfig.sh test script
2022-11-22 10:51:17 -08:00
Clément Péron 831d2a6855
Cmake add separate export for plugin targets (#31525)
* cmake: add separate export for plugin targets

Add a separate CMake export for the plugin targets to separate binaries
and libraries into their own CMake target export files. Skip the cross
compiled binary plugin targets during cross compile because they are not
usable and not always available.

The Yocto build system doesn't install cross compiled binaries into the
target sysroot. This makes the CMake gRPC config useless as it checks
the existent of binaries and fails without the binaries.

This is a strip down version of #22498 and related to #26148 and #26857.

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>

* regenerate cmake file

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
Co-authored-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
2022-11-15 11:26:29 -08:00
Craig Tiller 867dc6cae2
Revert "Add support for systemd socket activation (#30485)" (#31617)
This reverts commit a638c407bb.
2022-11-10 16:24:30 -08:00
Andres Beltran a638c407bb
Add support for systemd socket activation (#30485)
* Add socket-activated functionality

* Fix GRPC_ERROR_NONE in tcp_server_posix_test and sanity checks

* Fix epoll1 error, sanity checks

* Use AF_INET6 in tcp_server_posix_test

Co-authored-by: Vignesh Babu <vigneshbabu@google.com>
2022-11-10 11:05:14 -08:00
Nicolas Noble a285704aaf
bG6b3V2MNxQ (#30021) 2022-06-21 08:00:32 -07:00
Esun Kim 15d250b409
Added abseil include cmake guard (#29609) 2022-05-12 08:51:37 -07:00
Lidi Zheng 99752b173c
[xDS Proto] Enhence gRPC buildgen for 3rd party proto compilation (#29254)
* [xDS Proto] Enhence gRPC buildgen for 3rd party proto compilation

* Rebase from master to update envoy-api version

* Address reviewer's comments

* Address reviewer's comment

* Regenerate project

* Rename external_library

* Address reviewer's comments

* Add comments for the internals of generate C++ proto code

* Add proto file as a dependency to the custom command
2022-04-13 14:26:08 -07:00
Jan Tattermusch 24dfe21cad
activate ccache for selected win builds (#28735) 2022-03-10 19:50:34 +01:00
Jan Tattermusch f23f1bb51f
Use ccache for selected C++ and python builds (with redis server as cache) (#28661)
* add cmake support for ccache

* cleanup: use --env-file for docker run invocations

* make python build compatible with using ccache

* enable building using ccache in selected kokoro jobs

* print ccache stats and the end of run_tests.py
2022-01-25 19:18:58 +01:00
Esun Kim 84b9bda290
Install absel along with gRPC (#26802) 2021-08-05 11:31:16 -07:00
Paul Wankadia 7c5a7bd73b
Make Findre2.cmake idempotent. (#25821)
As per https://github.com/grpc/grpc/issues/25434, idempotence is necessary
because CMake fails when another target with the same name already exists.

Fixes #25434.
2021-04-08 11:55:06 +02:00
donnadionne d3e97d953b
Adding xxhash as a subtree (#25645) 2021-03-11 09:09:40 -08:00
donnadionne 34c8a1f87a
Revert "Adding xxhash as a subtree" (#25630)
This reverts commit 3880393fea.
2021-03-05 09:11:48 +01:00
donnadionne 40bc4624c2
Adding xxhash as a subtree (#25601)
* Squashed 'third_party/xxhash/' content from commit aea11081f3

git-subtree-dir: third_party/xxhash
git-subtree-split: aea11081f349893ec26f86ada22c66e828885083

* Adding xxhash as a subtree
2021-03-04 16:00:51 -08:00
capstan 1f670397ce Remove gflags.
With the move to abseil's flags, this removed the now-unnecessary submodule and installation commands.
2020-11-14 03:03:55 +01:00
Paul Wankadia 45e413d252 Attempt to find RE2 via CMake and via pkg-config. 2020-09-09 04:26:36 -07:00
Jan Tattermusch 6d6339db34 fix non-bazel build systems 2020-08-20 18:17:21 +02:00
Jan Tattermusch 10006758d0 Fix repeated builds broken by re2's cmake 2020-07-23 15:16:51 +02:00
Donna Dionne 8dd0cb4712 Add support for xDS regex matchers. 2020-07-07 13:17:25 -07:00
Jan Tattermusch f098606c4a Revert "Revert "Reintroduce #21527 (boringssl submodule unification)""
This reverts commit cca892022b.
2020-01-29 09:18:51 -05:00
hcaseyal cca892022b
Revert "Reintroduce #21527 (boringssl submodule unification)" 2020-01-27 13:46:10 -08:00
Jan Tattermusch b9b721226d
Merge pull request #21792 from KyleFromKitware/fix-runtime-flag
Fix regression in MSVC runtime flag
2020-01-27 19:16:50 +01:00
Jan Tattermusch e7e5d0198f Revert "Revert "Unify boringssl submodules and use non-developer boringssl cmake build""
This reverts commit fe2242e603.
2020-01-27 05:04:05 -05:00
Kyle Edwards 8f0d88a2a2 Fix regression in MSVC runtime flag
In attempting to fix a CMake style issue, a variable dereference
was accidentally removed that should have been left alone. Restore
it to how it was.
2020-01-24 13:23:58 -05:00
Jan Tattermusch fe2242e603
Revert "Unify boringssl submodules and use non-developer boringssl cmake build" 2020-01-20 14:27:31 +01:00
Jan Tattermusch e37e9aca2b set ssl.cmake to use CMakeLists.txt from boringssl-with-bazel 2020-01-16 03:44:37 -05:00
Esun Kim 5207eba9ff Add abseil 2020-01-03 19:29:55 -08:00
Zack Galbreath 64731f3c62 Add support for user-specified protoc
Make it possible to specify your own protoc when building protobuf in
a submodule.

When cross-compiling, we need to build the protobuf libraries for the
target architecture, yet we need to use a protoc executable built for
the host architecture.
2019-12-18 10:04:39 -05:00
Jan Tattermusch b5c3056d25
Merge pull request #21427 from zackgalbreath/cmake_ssl_assembly
Conditionally enable OPENSSL_NO_ASM for Visual Studio
2019-12-17 13:45:33 +01:00
Zack Galbreath 5f073edc8f Conditionally set OPENSSL_NO_ASM for Visual Studio
This configuration variable was originally set due to a bug in CMake.

We now build BoringSSL with assembly optimizations on Visual Studio
provided that the version of CMake we're using is "new enough" (3.13+)
and the NASM assembler is installed.
2019-12-16 07:40:49 -08:00
Jan Tattermusch cd56d66643
Merge pull request #21411 from zackgalbreath/thirdparty_install
Allow gRPC_INSTALL with module providers
2019-12-13 17:30:48 +01:00
Zack Galbreath cad4c32d43 Allow gRPC_INSTALL with module providers 2019-12-11 10:16:51 -05:00
Kyle Edwards 933d75653d Add Findc-ares.cmake module
This is a CMake find-module, which attempts to find c-ares without
a CMake package file being available. If such a file is available,
it uses that. Otherwise, it searches for the library and include
directory manually.
2019-12-06 11:22:25 -05:00
Esun Kim 109b7d75fe Add abseil targets 2019-11-27 10:59:52 -08:00
Jan Tattermusch 6d07e196e1 add explicit branch for PROVIDER=none 2019-11-20 10:01:14 -05:00
Esun Kim aaf48c66fc Change upb from filegroup to library 2019-11-05 14:20:56 -08:00
Esun Kim 8de389b940 Update by review 2019-11-04 17:05:51 -08:00
Esun Kim f33a7645c5 Removed _gRPC_*_INCLUDE_DIR 2019-11-01 17:02:01 -07:00
Kyle Edwards 0f2ad2a06c Use CMakePackageConfigHelpers to generate version file
The version file that already existed looks like it was generated
by this module. Replace it with proper usage of the module.
2019-10-25 11:58:19 -04:00
Kyle Edwards 14055e24d0 Fix line endings of cmake/gRPCConfig.cmake.in 2019-10-25 11:58:19 -04:00
Kyle Edwards 6f881ab292 Fix various CMake style issues
Remove some spaces at the end of lines. Change how variables are
referenced inside if() statements. Remove the space between if/endif
and the first parenthesis. Remove the duplicated condition from endif()
blocks. Make indentation more consistent. Remove unneeded duplicate
PRIVATE keywords from target_include_directories(). Remove redundant
set_source_files_properties() call, as the file is already GENERATED.
2019-10-25 11:58:19 -04:00
Jan Tattermusch 974fdc4cc4
Merge pull request #20630 from KyleFromKitware/cares-root-dir
Honor CARES_ROOT_DIR
2019-10-22 10:51:33 +02:00
Kyle Edwards 5f4b8c350d Honor CARES_ROOT_DIR
Honor CARES_ROOT_DIR in the add_subdirectory() call.

Fixes: #17876
2019-10-16 16:01:51 -04:00
Zack Galbreath 7bb75068b5 Create pkg-config files from CMake 2019-10-09 11:39:23 -04:00
Esun Kim 7ec6e8a4de Remove nanopb from gRPC 2019-08-21 13:31:21 -07:00
Esun Kim 6ddfb384c1 Added google/protobuf/descriptor.upb.* to google_api_upb 2019-08-07 12:08:06 -07:00
Esun Kim f88bd06ee5 Go UPB! 2019-08-06 15:27:14 -07:00