Merge pull request #14850 from vjpai/deinstall

Remove tool from cmake install
pull/14864/head
Jan Tattermusch 7 years ago committed by GitHub
commit 1951a7e61b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 63
      CMakeLists.txt
  2. 4
      templates/CMakeLists.txt.template

@ -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

@ -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

Loading…
Cancel
Save