Skip to content

Commit

Permalink
Remove support for tbb@2020_u3 fork
Browse files Browse the repository at this point in the history
Testing gazebosim/gazebo-classic#3146

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
  • Loading branch information
scpeters committed Dec 14, 2021
1 parent f0c87c0 commit a5aa954
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,6 @@ fi
if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'cmake@3.21.4' }.empty?"; then
export PATH=/usr/local/opt/cmake@3.21.4/bin:${PATH}
fi
# Workaround for tbb@2020_u3: set CPATH, LIBRARY_PATH, and CMAKE_PREFIX_PATH
if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name).keep_if { |d| d == 'tbb@2020_u3' }.empty?"; then
export CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}:/usr/local/opt/tbb@2020_u3
export CPATH=${CPATH}:/usr/local/opt/tbb@2020_u3/include
export LIBRARY_PATH=${LIBRARY_PATH}:/usr/local/opt/tbb@2020_u3/lib
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 a5aa954

Please sign in to comment.