Revert "cmake: fix #8729"

This reverts commit c019e057c2.
pull/11140/head
Alex Merry 8 years ago
parent 8ced27a364
commit b5984fa8d7
  1. 7
      CMakeLists.txt
  2. 7
      templates/CMakeLists.txt.template

@ -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) foreach(_config gRPCConfig gRPCConfigVersion)
configure_file(tools/cmake/${_config}.cmake.in configure_file(tools/cmake/${_config}.cmake.in
${_config}.cmake @ONLY) ${_config}.cmake @ONLY)

@ -618,6 +618,13 @@
endif() endif()
</%def> </%def>
if (gRPC_INSTALL)
install(EXPORT gRPCTargets
DESTINATION <%text>${CMAKE_INSTALL_CMAKEDIR}</%text>
NAMESPACE gRPC::
)
endif()
foreach(_config gRPCConfig gRPCConfigVersion) foreach(_config gRPCConfig gRPCConfigVersion)
configure_file(tools/cmake/<%text>${_config}</%text>.cmake.in configure_file(tools/cmake/<%text>${_config}</%text>.cmake.in
<%text>${_config}</%text>.cmake @ONLY) <%text>${_config}</%text>.cmake @ONLY)

Loading…
Cancel
Save