diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index c058e138..5627a6d7 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -44,9 +44,11 @@ jobs: run: | # libomp is installed as keg-only, so we need to manually point to it HOMEBREW_LIBOMP_PREFIX=`brew --prefix libomp` - OMP_FLAGS="-Xpreprocessor;-fopenmp;-I${HOMEBREW_LIBOMP_PREFIX}/include" - echo "EXTRA_CMAKE_ARGS=-DOpenMP_C_FLAGS=$OMP_FLAGS -DOpenMP_C_LIB_NAMES=omp -DOpenMP_CXX_FLAGS=$OMP_FLAGS -DOpenMP_CXX_LIB_NAMES=omp -DOpenMP_omp_LIBRARY=$HOMEBREW_LIBOMP_PREFIX/lib/libomp.dylib -DCMAKE_PREFIX_PATH=$HOMEBREW_LIBOMP_PREFIX" >> "$GITHUB_ENV" - echo "DYLD_LIBRARY_PATH=$HOMEBREW_LIBOMP_PREFIX/lib:$DYLD_LIBRARY_PATH" >> "$GITHUB_ENV" + OMP_FLAGS="-Xpreprocessor -fopenmp -I${HOMEBREW_LIBOMP_PREFIX}/include" + echo "{\"version\": 1, \"configurePresents\": [{\"name\": \"ci-preset\", \"cacheVariables\": {\"OpenMP_C_FLAGS\": \"$OMP_FLAGS\", \"OpenMP_CXX_FLAGS\": \"$OMP_FLAGS\", \"OpenMP_C_LIB_NAMES\": \"omp\", \"OpenMP_CXX_LIB_NAMES\": \"omp\", \"OpenMP_omp_LIBRARY\": \"$HOMEBREW_LIBOMP_PREFIX/lib/libomp.dylib\"}}]}" >> CMakeUserPresets.json + echo "EXTRA_CMAKE_ARGS=--preset ci-preset" >> "$GITHUB_ENV" + #echo "EXTRA_CMAKE_ARGS=-DOpenMP_C_FLAGS=$OMP_FLAGS -DOpenMP_C_LIB_NAMES=omp -DOpenMP_CXX_FLAGS=$OMP_FLAGS -DOpenMP_CXX_LIB_NAMES=omp -DOpenMP_omp_LIBRARY=$HOMEBREW_LIBOMP_PREFIX/lib/libomp.dylib -DCMAKE_PREFIX_PATH=$HOMEBREW_LIBOMP_PREFIX" >> "$GITHUB_ENV" + #echo "DYLD_LIBRARY_PATH=$HOMEBREW_LIBOMP_PREFIX/lib:$DYLD_LIBRARY_PATH" >> "$GITHUB_ENV" - name: Configure run: |