2nd try to get OpenMP working again on macOS.

DIPlib · Mar 18, 2024 · 69fac7a · 69fac7a
1 parent 90a5ab8
commit 69fac7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -43,8 +43,8 @@ jobs:
           - os: macos-latest
             n_cores: 3
             env:
-              LDFLAGS: "-L/usr/local/opt/libomp/lib"
-              CPPFLAGS: "-I/usr/local/opt/libomp/include"
+              LDFLAGS: -L/usr/local/opt/libomp/lib
+              CPPFLAGS: -I/usr/local/opt/libomp/include
           - os: windows-latest
             n_cores: 4
             dip_cmake_opts: -A x64 -DDIP_ENABLE_UNICODE=Off -DGLFW_INCLUDE_DIR="glfw-3.3.5.bin.WIN64/include" -DGLFW_LIBRARY="glfw-3.3.5.bin.WIN64/lib-vc2019/glfw3.lib" -DDIP_FIND_FREEGLUT=Off
@@ -69,6 +69,8 @@ jobs:
           elif [ "$RUNNER_OS" == "macOS" ]; then
             brew install libomp glfw
             python3 -m pip install setuptools wheel build numpy
+            echo LDFLAGS = $LDFLAGS
+            echo CPPFLAGS = $CPPFLAGS
           fi
         shell: bash
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -40,8 +40,8 @@ jobs:
           HOMEBREW_DIR: /usr/local
           BUILD_THREADS: 3
           MACOSX_DEPLOYMENT_TARGET: 12.0
-          LDFLAGS: "-L/usr/local/opt/libomp/lib"
-          CPPFLAGS: "-I/usr/local/opt/libomp/include"
+          LDFLAGS: -L/usr/local/opt/libomp/lib
+          CPPFLAGS: -I/usr/local/opt/libomp/include
 
 
   deploy_macos_aarch64:
@@ -66,8 +66,8 @@ jobs:
           HOMEBREW_DIR: /opt/homebrew
           BUILD_THREADS: 3
           MACOSX_DEPLOYMENT_TARGET: 12.0
-          LDFLAGS: "-L/opt/homebrew/opt/libomp/lib"
-          CPPFLAGS: "-I/opt/homebrew/opt/libomp/include"
+          LDFLAGS: -L/opt/homebrew/opt/libomp/lib
+          CPPFLAGS: -I/opt/homebrew/opt/libomp/include
 
   deploy_windows:
     runs-on: windows-latest