diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-03-29 09:41:53 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-03-29 09:41:53 +0200 |
| commit | 1951a7e61bec2a1ca0cc61e5e8f72a2c274fdb00 (patch) | |
| tree | a8487aabf4bf6a788cdce8dc973a39ed0e80d963 | |
| parent | 37ff1594969b50960b1289a1b19e994cdbf0456f (diff) | |
| parent | c4cc740d613d783304ff40989f0778eb9b655d18 (diff) | |
Merge pull request #14850 from vjpai/deinstall
Remove tool from cmake install
| -rw-r--r-- | CMakeLists.txt | 63 | ||||
| -rw-r--r-- | templates/CMakeLists.txt.template | 4 |
2 files changed, 4 insertions, 63 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b9e6988e3..23b2958d2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5703,15 +5703,6 @@ target_link_libraries(check_epollexclusive gpr ) - -if (gRPC_INSTALL) - install(TARGETS check_epollexclusive EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) -endif() - if (gRPC_BUILD_TESTS) add_executable(chttp2_hpack_encoder_test @@ -6987,15 +6978,6 @@ target_link_libraries(grpc_create_jwt gpr ) - -if (gRPC_INSTALL) - install(TARGETS grpc_create_jwt EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) -endif() - if (gRPC_BUILD_TESTS) add_executable(grpc_credentials_test @@ -7135,15 +7117,6 @@ target_link_libraries(grpc_print_google_default_creds_token gpr ) - -if (gRPC_INSTALL) - install(TARGETS grpc_print_google_default_creds_token EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) -endif() - if (gRPC_BUILD_TESTS) add_executable(grpc_security_connector_test @@ -7225,15 +7198,6 @@ target_link_libraries(grpc_verify_jwt gpr ) - -if (gRPC_INSTALL) - install(TARGETS grpc_verify_jwt EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) -endif() - if (gRPC_BUILD_TESTS) if(_gRPC_PLATFORM_LINUX) @@ -13895,15 +13859,6 @@ target_link_libraries(gen_hpack_tables ) -if (gRPC_INSTALL) - install(TARGETS gen_hpack_tables EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) -endif() - - add_executable(gen_legal_metadata_characters tools/codegen/core/gen_legal_metadata_characters.cc ) @@ -13926,15 +13881,6 @@ target_link_libraries(gen_legal_metadata_characters ) -if (gRPC_INSTALL) - install(TARGETS gen_legal_metadata_characters EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) -endif() - - add_executable(gen_percent_encoding_tables tools/codegen/core/gen_percent_encoding_tables.cc ) @@ -13956,15 +13902,6 @@ target_link_libraries(gen_percent_encoding_tables ${_gRPC_ALLTARGETS_LIBRARIES} ) - -if (gRPC_INSTALL) - install(TARGETS gen_percent_encoding_tables EXPORT gRPCTargets - RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} - LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} - ) -endif() - if (gRPC_BUILD_TESTS) add_executable(badreq_bad_client_test diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 01fe569c2b..8a1581a653 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -298,11 +298,13 @@ endif (gRPC_BUILD_TESTS) % else: ${cc_library(lib)} + % if not lib.build in ["tool"]: ${cc_install(lib)} % endif % endif % endif % endif + % endif % endfor % for tgt in targets: @@ -323,7 +325,9 @@ % else: ${get_platforms_condition_begin(tgt.platforms)}\ ${cc_binary(tgt)} + % if not tgt.build in ["tool"]: ${cc_install(tgt)} + % endif ${get_platforms_condition_end(tgt.platforms)}\ % endif % endif |