Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ jobs:
run: |
# ParaView dependencies
brew install --cask xquartz
brew install llvm mesa glew qt@5 ninja
brew install llvm lld mesa glew qt@5 ninja
# TTK dependencies
brew install boost cgal eigen graphviz spectra sqlite zlib numpy qhull

Expand All @@ -224,6 +224,8 @@ jobs:
run: |
echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV
echo "CPPFLAGS=$(brew --prefix llvm)/include" >> $GITHUB_ENV
echo "LDFLAGS=-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib/unwind -lunwind" >> $GITHUB_ENV

- name: Create & configure TTK build directory
run: |
Expand Down Expand Up @@ -281,7 +283,7 @@ jobs:
run: |
# ParaView dependencies
brew install --cask xquartz
brew install llvm mesa glew qt@5 ninja
brew install llvm lld mesa glew qt@5 ninja
# TTK dependencies
brew install boost cgal eigen graphviz spectra sqlite zlib numpy qhull

Expand Down Expand Up @@ -314,6 +316,9 @@ jobs:
run: |
echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV
echo "CPPFLAGS=$(brew --prefix llvm)/include" >> $GITHUB_ENV
echo "LDFLAGS=-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib/unwind -lunwind" >> $GITHUB_ENV

echo "CMAKE_PREFIX_PATH=$(brew --prefix qt@5)/lib/cmake:$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
# pvpython does not embed the correct PYTHONPATH
echo "PYTHONPATH=/usr/local/lib/python3.12/site-packages:$PYTHONPATH" >> $GITHUB_ENV
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ jobs:
run: |
# ParaView dependencies
brew install --cask xquartz
brew install llvm ninja open-mpi
brew install llvm lld ninja open-mpi
# TTK dependencies
brew install boost cgal eigen graphviz spectra sqlite zlib numpy qhull

Expand Down Expand Up @@ -320,6 +320,8 @@ jobs:
run: |
echo "CC=$(brew --prefix llvm)/bin/clang" >> $GITHUB_ENV
echo "CXX=$(brew --prefix llvm)/bin/clang++" >> $GITHUB_ENV
echo "CPPFLAGS=$(brew --prefix llvm)/include" >> $GITHUB_ENV
echo "LDFLAGS=-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib/unwind -lunwind" >> $GITHUB_ENV

- name: Create & configure TTK build directory
run: |
Expand Down
2 changes: 1 addition & 1 deletion paraview/xmls/PersistenceDiagram.xml
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
default_values="2"
panel_visibility="advanced" >
<EnumerationDomain name="enum">
<Entry value="0" text="FTM (IEEE TPSD 2019)"/>
<Entry value="0" text="FTM (IEEE TPDS 2019)"/>
<Entry value="1" text="Progressive Approach (IEEE TVCG 2020)"/>
<Entry value="2" text="Discrete Morse Sandwich (IEEE TVCG 2023)"/>
<Entry value="3" text="Approximation Approach (IEEE LDAV 2021)"/>
Expand Down
Loading