From 0c38102fb3bfd1893945923ed86e46e17605f39d Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Thu, 3 Mar 2022 20:33:18 -0800 Subject: [PATCH] brew: test fix for new tbb with gazebo (#652) Don't set tbb@2020_u3 variables if github branch name matches replace_deprecated_tbb_task, which allows testing of osrf/gazebo#3174. Signed-off-by: Steve Peters --- .../lib/project-default-devel-homebrew-amd64.bash | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash index 2cce75ae5..64fbce01b 100644 --- a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash +++ b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash @@ -136,9 +136,11 @@ if brew ruby -e "exit ! '${PROJECT_FORMULA}'.f.recursive_dependencies.map(&:name 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 + if [ "${ghprbSourceBranch}" != "replace_deprecated_tbb_task" ]; 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 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