Skip to content

Commit

Permalink
brew: set CPATH if tbb@2020 is a dependency
Browse files Browse the repository at this point in the history
See discussion in the following issue:
osrf/homebrew-simulation#1477

This was needed by the gazebo11 test in
osrf/homebrew-simulation#1479

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
  • Loading branch information
scpeters committed May 21, 2021
1 parent 471d223 commit 33ca66e
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ export DISPLAY=$(ps ax \
if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'qt@5' }.empty?"; then
export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/usr/local/opt/qt@5
fi
# Workaround for tbb@2020: set CPATH
if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'tbb@2020' }.empty?"; then
export CPATH=${CPATH}:/usr/local/opt/tbb@2020/include
fi
# Workaround for tinyxml2 6.2.0: set CMAKE_PREFIX_PATH and PKG_CONFIG_PATH if we are using tinyxml2@6.2.0
if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'tinyxml2@6.2.0' }.empty?"; then
export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/usr/local/opt/tinyxml2@6.2.0
Expand Down

0 comments on commit 33ca66e

Please sign in to comment.