Merge pull request #1 from nicolasnoble/cmake-fixes

Generating project file.
pull/7762/head
Arkady Shapkin 8 years ago committed by GitHub
commit 407dc4f28b
  1. 6
      CMakeLists.txt

@ -279,6 +279,7 @@ foreach(_hdr
) )
endforeach() endforeach()
if (gRPC_INSTALL) if (gRPC_INSTALL)
install(TARGETS gpr EXPORT gRPCTargets install(TARGETS gpr EXPORT gRPCTargets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@ -287,6 +288,7 @@ if (gRPC_INSTALL)
) )
endif() endif()
add_library(grpc add_library(grpc
src/core/lib/surface/init.c src/core/lib/surface/init.c
src/core/lib/channel/channel_args.c src/core/lib/channel/channel_args.c
@ -992,7 +994,6 @@ foreach(_hdr
endforeach() endforeach()
if (gRPC_INSTALL) if (gRPC_INSTALL)
install(TARGETS grpc_unsecure EXPORT gRPCTargets install(TARGETS grpc_unsecure EXPORT gRPCTargets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@ -1813,6 +1814,9 @@ endif()
if (gRPC_INSTALL) if (gRPC_INSTALL)
install(EXPORT gRPCTargets install(EXPORT gRPCTargets
DESTINATION ${CMAKE_INSTALL_CMAKEDIR} DESTINATION ${CMAKE_INSTALL_CMAKEDIR}

Loading…
Cancel
Save