diff options
| author |  Alex Merry <alex.merry@kde.org> | 2017-05-15 21:04:16 +0100 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2017-05-15 22:42:03 +0100 |
| commit | b5984fa8d765c251a8ad2a0717c50be2710fa4b4 (patch) | |
| tree | 41839639871d38832306619355d42cfbc0caa8db | |
| parent | 8ced27a3641d3818b6324254e197141c57a37cee (diff) | |
Revert "cmake: fix #8729"
This reverts commit c019e057c20db0b9c9a2f76fb0b9cd6f44addf92.
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | templates/CMakeLists.txt.template | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a65ce567a6..c4e0e0162d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14326,6 +14326,13 @@ endif (gRPC_BUILD_TESTS) +if (gRPC_INSTALL) + install(EXPORT gRPCTargets + DESTINATION ${CMAKE_INSTALL_CMAKEDIR} + NAMESPACE gRPC:: + ) +endif() + foreach(_config gRPCConfig gRPCConfigVersion) configure_file(tools/cmake/${_config}.cmake.in ${_config}.cmake @ONLY) diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 3e03afdf57..acf39305fa 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -618,6 +618,13 @@ endif() </%def> + if (gRPC_INSTALL) + install(EXPORT gRPCTargets + DESTINATION <%text>${CMAKE_INSTALL_CMAKEDIR}</%text> + NAMESPACE gRPC:: + ) + endif() + foreach(_config gRPCConfig gRPCConfigVersion) configure_file(tools/cmake/<%text>${_config}</%text>.cmake.in <%text>${_config}</%text>.cmake @ONLY) |