Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve ODR issues with manipulation_station example #9826

Merged
merged 1 commit into from
Oct 29, 2018
Merged

Resolve ODR issues with manipulation_station example #9826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bindings/pydrake/examples/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ drake_pybind_library(
name = "manipulation_station_py",
cc_deps = [
"//bindings/pydrake:documentation_pybind",
"//examples/manipulation_station",
],
cc_srcs = ["manipulation_station_py.cc"],
package_info = PACKAGE_INFO,
Expand Down
1 change: 1 addition & 0 deletions tools/install/libdrake/build_components.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ LIBDRAKE_COMPONENTS = [
"//common/trajectories",
"//common:drake_marker_shared_library", # unpackaged
"//common:text_logging_gflags_h", # unpackaged
"//examples/manipulation_station:manipulation_station", # unpackaged
"//geometry",
"//geometry/dev",
"//geometry/dev/render",
Expand Down
8 changes: 7 additions & 1 deletion tools/install/libdrake/build_components_refresh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,18 @@ def _bazel_query(args):

def _find_libdrake_components():
# This forms the set of cc_library targets that will be installed.
# TODO(russt/eric-cousineau/jwnimmer): Remove any examples from
# libdrake.so, pending resolution of #9648.
components_query = """
kind("cc_library", visible("//tools/install/libdrake:libdrake.so", "//..."))
except(attr("testonly", "1", "//..."))
except("//:*")
except("//bindings/pydrake/...")
except("//examples/...")
except(
"//examples/..." except(
"//examples/manipulation_station/..."
)
)
except("//lcmtypes/...")
except("//tools/install/libdrake:*")
except(attr(tags, "exclude_from_libdrake", //...))
Expand Down