Merge pull request #9826 from RussTedrake/manipulation_station_odr

Resolve ODR issues with manipulation_station example
RobotLocomotion · Oct 29, 2018 · f69bfcc · f69bfcc
2 parents d173668 + 135340e
commit f69bfcc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/bindings/pydrake/examples/BUILD.bazel b/bindings/pydrake/examples/BUILD.bazel
@@ -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,

diff --git a/tools/install/libdrake/build_components.bzl b/tools/install/libdrake/build_components.bzl
@@ -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",

diff --git a/tools/install/libdrake/build_components_refresh.py b/tools/install/libdrake/build_components_refresh.py
@@ -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", //...))