-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use yaml-cpp from system on Xenial and homebrew on MacOS. (#7602)
* Use yaml_cpp from Ubuntu Xenial. This removes the bazel external yaml_cpp and replaces it with system yaml_cpp found via pkg-config. Using the system version cuts down on the size of libdrake.so and improves linking compatibility when using Drake within systems that use the system yaml-cpp version. This change was previously introduced in #7352 and later reverted (#7403) due to issues with the MacOS build. Other portions of that original pull request were reintroduced in #7453.
- Loading branch information
1 parent
f47ae21
commit 731865a
Showing
7 changed files
with
27 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Altered copy of the pkg_config_package build template. | ||
# Adds a hard-coded dependency on "@boost" to work around a yaml-cpp | ||
# misconfiguration. | ||
# https://github.com/RobotLocomotion/drake/pull/7602#issuecomment-353093726 | ||
|
||
package( | ||
default_visibility = ["//visibility:public"], | ||
) | ||
|
||
cc_library( | ||
name = "%{name}", | ||
srcs = ["%{srcs}"], | ||
hdrs = glob(["include/**"]), | ||
defines = ["%{defines}"], | ||
includes = ["%{includes}"], | ||
linkopts = ["%{linkopts}"], | ||
deps = ["@boost//:boost_headers"] | ||
) |