From 33ca66eb6b25570478331ca986751743e09a5a02 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Fri, 21 May 2021 15:24:44 -0700 Subject: [PATCH] brew: set CPATH if tbb@2020 is a dependency See discussion in the following issue: https://github.com/osrf/homebrew-simulation/issues/1477 This was needed by the gazebo11 test in https://github.com/osrf/homebrew-simulation/pull/1479 Signed-off-by: Steve Peters --- jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash index a796926c3..eb787f49a 100644 --- a/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash +++ b/jenkins-scripts/lib/project-default-devel-homebrew-amd64.bash @@ -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