Skip to content

Commit

Permalink
Use fully-scoped formula names for non-core formulae (RobotLocomotion…
Browse files Browse the repository at this point in the history
  • Loading branch information
jamiesnape authored Jun 5, 2019
1 parent 0a8048e commit f4ae037
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
6 changes: 3 additions & 3 deletions setup/mac/binary_distribution/Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ tap 'robotlocomotion/director'

brew 'boost'
brew 'cmake'
brew 'dreal'
brew 'dreal/dreal/dreal'
brew 'gcc'
brew 'gflags'
brew 'glew'
brew 'glib'
brew 'ipopt'
brew 'robotlocomotion/director/ipopt@3.12'
brew 'libyaml'
brew 'lz4'
brew 'nlopt'
Expand All @@ -22,7 +22,7 @@ brew 'python@2'
brew 'scipy'
brew 'tinyxml'
brew 'tinyxml2'
brew '[email protected]'
brew 'robotlocomotion/director/[email protected]'
brew 'yaml-cpp'
brew 'zeromq'

Expand Down
2 changes: 2 additions & 0 deletions setup/mac/binary_distribution/install_prereqs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ fi
# TODO(jamiesnape): Remove line uninstalling embree, ospray, and [email protected]
# formulae on or after 2019-07-01.
/usr/local/bin/brew uninstall --force embree ospray [email protected]
# TODO(jamiesnape): Remove line uninstalling ipopt on or after 2019-08-01.
/usr/local/bin/brew uninstall --force ipopt
/usr/local/bin/brew bundle --file="${BASH_SOURCE%/*}/Brewfile"

/usr/local/bin/pip2 install --upgrade --requirement "${BASH_SOURCE%/*}/requirements.txt"
Expand Down
5 changes: 4 additions & 1 deletion tools/workspace/ipopt/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ def ipopt_repository(
"unencumbered", # Public-Domain
],
modname = "ipopt",
pkg_config_paths = ["/usr/local/opt/ipopt/lib/pkgconfig"],
pkg_config_paths = [
"/usr/local/opt/[email protected]/lib/pkgconfig",
"/usr/local/opt/ipopt/lib/pkgconfig",
],
**kwargs):
pkg_config_repository(
name = name,
Expand Down

0 comments on commit f4ae037

Please sign in to comment.