Skip to content

Commit 121e59e

Browse files
committed
[ci] added macos specific actions
1 parent 0123cb5 commit 121e59e

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

.github/actions/test-ttk-macos/action.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ runs:
99
run: |
1010
cd $GITHUB_WORKSPACE/examples/c++
1111
mkdir build && cd build
12-
cmake ..
12+
cmake .. \
13+
-DOpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
14+
-DOpenMP_C_LIB_NAMES="omp" \
15+
-DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
16+
-DOpenMP_CXX_LIB_NAMES="omp" \
17+
-DOpenMP_omp_LIBRARY=/opt/homebrew/opt/libomp/lib/libomp.dylib \
18+
-DCMAKE_EXE_LINKER_FLAGS="-L/opt/homebrew/opt/libomp/lib -lomp"
1319
cmake --build . --parallel
1420
./ttkExample-c++ -i ../../data/inputData.off
1521
@@ -18,7 +24,13 @@ runs:
1824
run: |
1925
cd $GITHUB_WORKSPACE/examples/vtk-c++
2026
mkdir build && cd build
21-
cmake ..
27+
cmake .. \
28+
-DOpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
29+
-DOpenMP_C_LIB_NAMES="omp" \
30+
-DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
31+
-DOpenMP_CXX_LIB_NAMES="omp" \
32+
-DOpenMP_omp_LIBRARY=/opt/homebrew/opt/libomp/lib/libomp.dylib \
33+
-DCMAKE_EXE_LINKER_FLAGS="-L/opt/homebrew/opt/libomp/lib -lomp"
2234
cmake --build . --parallel
2335
./ttkExample-vtk-c++ -i ../../data/inputData.vtu
2436

.github/workflows/test.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
run: sccache --show-stats
132132

133133
- name: Run TTK tests
134-
uses: ./.github/actions/test-ttk-unix
134+
uses: ./.github/actions/test-ttk-ubuntu
135135

136136
- name: Upload TTK .deb package for fast install in tests
137137
uses: actions/upload-artifact@v4
@@ -323,20 +323,6 @@ jobs:
323323
# pvpython is expecting a vtkpython executable at this path
324324
sudo ln -s /usr/local/bin/pvpython /Library/Frameworks/Python.framework/Versions/3.13/vtkpython
325325
326-
- name: Set compilers as environment variables
327-
run: |
328-
#echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
329-
#echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV
330-
#echo "CPPFLAGS=$(brew --prefix llvm)/include" >> $GITHUB_ENV
331-
#echo "CXXFLAGS=$(brew --prefix llvm)/include/ $(xcrun --show-sdk-path)" >> $GITHUB_ENV
332-
#echo "LDFLAGS=-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib/unwind -lunwind" >> $GITHUB_ENV
333-
echo "OpenMP_C_FLAGS=\"-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include\"" >> $GITHUB_ENV
334-
echo "OpenMP_C_LIB_NAMES=\"omp\"" >> $GITHUB_ENV
335-
echo "OpenMP_CXX_FLAGS=\"-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include\"" >> $GITHUB_ENV
336-
echo "OpenMP_CXX_LIB_NAMES=\"omp\"" >> $GITHUB_ENV
337-
echo "OpenMP_omp_LIBRARY=/opt/homebrew/opt/libomp/lib/libomp.dylib" >> $GITHUB_ENV
338-
echo "CMAKE_EXE_LINKER_FLAGS=\"-L/opt/homebrew/opt/libomp/lib -lomp\"">> $GITHUB_ENV
339-
340326
- name: Create & configure TTK build directory
341327
run: |
342328
mkdir build
@@ -345,6 +331,12 @@ jobs:
345331
-DCMAKE_BUILD_TYPE=Release \
346332
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
347333
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
334+
-DOpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
335+
-DOpenMP_C_LIB_NAMES="omp" \
336+
-DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include" \
337+
-DOpenMP_CXX_LIB_NAMES="omp" \
338+
-DOpenMP_omp_LIBRARY=/opt/homebrew/opt/libomp/lib/libomp.dylib \
339+
-DCMAKE_EXE_LINKER_FLAGS="-L/opt/homebrew/opt/libomp/lib -lomp" \
348340
-DTTK_BUILD_PARAVIEW_PLUGINS=TRUE \
349341
-DTTK_BUILD_VTK_WRAPPERS=TRUE \
350342
-DTTK_BUILD_STANDALONE_APPS=TRUE \
@@ -370,7 +362,7 @@ jobs:
370362
run: sccache --show-stats
371363

372364
- name: Run TTK tests
373-
uses: ./.github/actions/test-ttk-unix
365+
uses: ./.github/actions/test-ttk-macos
374366

375367
- uses: actions/checkout@v4
376368
with:

0 commit comments

Comments
 (0)