Merge pull request #1898 from danrbailey/fix_macos_houdini

Fix MacOS Houdini Build
AcademySoftwareFoundation · Sep 17, 2024 · c2b179f · c2b179f
2 parents 8340096 + 1ac05f2
commit c2b179f
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 9 deletions.
diff --git a/.github/workflows/ax.yml b/.github/workflows/ax.yml
@@ -134,7 +134,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: install_deps
-        run: ./ci/install_macos.sh ${{ matrix.config.llvm }}
+        run: |
+          ./ci/install_macos.sh ${{ matrix.config.llvm }}
+          ./ci/install_tbb_macos.sh
       - name: build
         run: >
           ./ci/build.sh -v

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -197,7 +197,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: install
-      run: ./ci/install_macos.sh
+      run: |
+        ./ci/install_macos.sh
+        ./ci/install_tbb_macos.sh
     - name: build
       run: >
         ./ci/build.sh -v

diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml
@@ -162,21 +162,22 @@ jobs:
         cp hou/hou.tar.gz $HOME/houdini_install/hou.tar.gz
         cd $HOME/houdini_install && tar -xzf hou.tar.gz && cd -
     - name: install_deps
-      run: ./ci/install_macos.sh ${{ matrix.config.llvm }}
+      run: ./ci/install_macos.sh 15
     - name: build
       run: |
         ./ci/build.sh -v \
           --build-type=Release \
-          --components="core,hou,bin,view,render,python,test,axcore,axbin,axtest" \
+          --components="core,hou,bin,view,render,python,test,axcore,axbin" \
           --cargs=\" \
             -DHOUDINI_ROOT=$HOME/houdini_install/hou \
             -DOPENVDB_BUILD_HOUDINI_ABITESTS=OFF \
             -DOPENVDB_HOUDINI_INSTALL_PREFIX=/tmp \
             -DDISABLE_CMAKE_SEARCH_PATHS=ON \
             -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \
             -DUSE_EXPLICIT_INSTANTIATION=OFF \
-            -DLLVM_DIR=/usr/local/opt/llvm@15/lib/cmake/llvm \
-            -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install
+            -DTbb_INCLUDE_DIR=$HOME/houdini_install/hou/Frameworks/Houdini.framework/Versions/Current/Resources/toolkit/include/tbb \
+            -DLLVM_DIR=/opt/homebrew/opt/llvm@15/lib/cmake/llvm \
+            -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install \
             \"
     - name: test
       run: cd build && ctest -V
diff --git a/.github/workflows/nanovdb.yml b/.github/workflows/nanovdb.yml
@@ -167,7 +167,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: install_deps
-        run: ./ci/install_macos.sh
+        run: |
+          ./ci/install_macos.sh
+          ./ci/install_tbb_macos.sh
       - name: build
         run: >
           ./ci/build.sh -v

diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
@@ -216,6 +216,7 @@ jobs:
             sudo apt-get -q install -y libboost-dev libboost-iostreams-dev libtbb-dev libblosc-dev llvm-dev libgtest-dev libcppunit-dev pybind11-dev
           elif [ "$RUNNER_OS" == "macOS" ]; then
             ./ci/install_macos.sh 15
+            ./ci/install_tbb_macos.sh
           else
             echo "$RUNNER_OS not supported"; exit 1
           fi
@@ -317,7 +318,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: install_deps
-        run: ./ci/install_macos.sh ${{ matrix.config.llvm }}
+        run: |
+          ./ci/install_macos.sh ${{ matrix.config.llvm }}
+          ./ci/install_tbb_macos.sh
       - name: build
         run: >
           ./ci/build.sh -v

diff --git a/ci/install_macos.sh b/ci/install_macos.sh
@@ -19,7 +19,6 @@ brew install googletest
 brew install jq # for trivial parsing of brew json
 brew install openexr
 brew install pybind11 # also installs the dependent python version
-brew install tbb
 brew install zlib
 brew install jemalloc
 
@@ -31,6 +30,10 @@ echo "Using python $py_version"
 echo "Python_ROOT_DIR=/usr/local/opt/$py_version" >> $GITHUB_ENV
 echo "/usr/local/opt/$py_version/bin" >> $GITHUB_PATH
 
+# use bash
+echo "/usr/local/opt/bash/bin" >> $GITHUB_PATH
+echo "/opt/homebrew/opt/bash/bin" >> $GITHUB_PATH
+
 # use gnu-getopt
 echo "/usr/local/opt/gnu-getopt/bin" >> $GITHUB_PATH
 echo "/opt/homebrew/opt/gnu-getopt/bin" >> $GITHUB_PATH

diff --git a/ci/install_tbb_macos.sh b/ci/install_tbb_macos.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -x
+
+brew update
+brew install tbb