Merge pull request #892 from mrapp-ke/merge-bugfix

Merge bugfix into feature branch
mrapp-ke · May 5, 2024 · e1964c9 · e1964c9
2 parents 2370733 + 745f238
commit e1964c9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/template_publish_platform.yml b/.github/workflows/template_publish_platform.yml
@@ -33,17 +33,15 @@ jobs:
           echo "Set version to $(cat VERSION)"
       - name: Install OpenMP
         if: matrix.os == 'macos-latest'
-        run: |
-          brew install libomp
-          brew link libomp --force
+        run: brew install libomp
       - name: Prepare MSVC
         if: matrix.os == 'windows-latest'
         uses: ilammy/msvc-dev-cmd@v1
       - name: Build package
         uses: pypa/[email protected]
         env:
           CIBW_BEFORE_BUILD_LINUX: ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled GPU_SUPPORT=disabled ./build install
-          CIBW_BEFORE_BUILD_MACOS: rm -rf venv && ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled GPU_SUPPORT=disabled ./build install
+          CIBW_BEFORE_BUILD_MACOS: rm -rf venv && ./build --clean && SUBPROJECTS=${{ inputs.subproject }} TEST_SUPPORT=disabled GPU_SUPPORT=disabled CPLUS_INCLUDE_PATH=/opt/homebrew/opt/libomp/include/ LIBRARY_PATH=/opt/homebrew/opt/libomp/lib/ ./build install
           CIBW_BEFORE_BUILD_WINDOWS: .\build.bat --clean && set SUBPROJECTS=${{ inputs.subproject }} && set TEST_SUPPORT=disabled && set GPU_SUPPORT=disabled && .\build.bat install
           CIBW_BUILD_FRONTEND: build
           CIBW_ARCHS: auto64

diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml
@@ -123,17 +123,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Install OpenMP
-        run: |
-          brew install libomp
-          brew link libomp --force
+        run: brew install libomp
       - name: Install OpenCL
         run: brew install opencl-clhpp-headers
       - name: Prepare ccache
         uses: hendrikmuhs/ccache-action@v1
         with:
           key: ${{ runner.os }}-test-build-ccache
       - name: Compile via Clang
-        run: TEST_SUPPORT=disabled CPLUS_INCLUDE_PATH=/usr/local/opt/opencl-clhpp-headers/include ./build compile
+        run: TEST_SUPPORT=disabled CPLUS_INCLUDE_PATH=/opt/homebrew/opt/libomp/include/:/opt/homebrew/opt/opencl-clhpp-headers/include/ LIBRARY_PATH=/opt/homebrew/opt/libomp/lib/ ./build compile
   windows_build:
     needs: changes
     if: ${{ needs.changes.outputs.cpp == 'true' }}