Merge branch 'dev' of https://github.com/topology-tool-kit/ttk into cinemaImagingBackend

Author: JonasLukasczyk

.github/workflows/main.yml

@@ -167,7 +167,7 @@ jobs:
       run: |
         # ParaView dependencies
         brew cask install xquartz
-        brew install wget python libomp mesa glew qt
+        brew install wget python@3.8 libomp mesa glew qt
         # TTK dependencies
         brew install boost eigen graphviz
         python3 -m pip install scikit-learn
@@ -237,7 +237,7 @@ jobs:
       run: |
         # ParaView dependencies
         brew cask install xquartz
-        brew install wget python libomp mesa glew qt
+        brew install wget python@3.8 libomp mesa glew qt
         # TTK dependencies
         brew install boost graphviz
         python3 -m pip install scikit-learn
@@ -307,6 +307,12 @@ jobs:
       run: |
         ttk-paraview.exe /S
 
+    - name: Fetch Visual C++ redistribuable run-time
+      run: |
+        Invoke-WebRequest `
+          -OutFile vc_redist.x64.exe `
+          -Uri https://aka.ms/vs/16/release/vc_redist.x64.exe
+
     - name: Configure TTK
       shell: cmd
       run: |

CMakeLists.txt

@@ -56,6 +56,13 @@ set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
 if(APPLE)
   set(CPACK_COMPONENTS_ALL Unspecified python development)
 endif()
+# embed Visual C++ redistribuable for Windows
+if(WIN32 AND EXISTS "${CMAKE_SOURCE_DIR}/vc_redist.x64.exe")
+  install(PROGRAMS "${CMAKE_SOURCE_DIR}/vc_redist.x64.exe" DESTINATION bin)
+  list(APPEND CPACK_NSIS_EXTRA_INSTALL_COMMANDS
+    " ExecWait '$INSTDIR\\\\bin\\\\vc_redist.x64.exe /passive /norestart'
+      Delete '$INSTDIR\\\\bin\\\\vc_redist.x64.exe' ")
+endif()
 include(CPack)
 
 if(TTK_BUILD_STANDALONE_APPS AND NOT TTK_BUILD_VTK_WRAPPERS)

azure-pipelines.yml

@@ -364,7 +364,7 @@ jobs:
   steps:
   - script: |
       brew cask install xquartz
-      brew install wget python libomp mesa glew boost ccache qt
+      brew install wget python@3.8 libomp mesa glew boost ccache qt
     displayName: 'Install dependencies'
 
   - script: |

paraview/BottleneckDistance/BottleneckDistance.xml

@@ -231,7 +231,7 @@ the extremum</Documentation>
       <OutputPort name="Persistence Mesh" index="2" id="port2"/>
 
       <Hints>
-        <ShowInMenu category="TTK - Scalar Data" />
+        <ShowInMenu category="TTK - Ensemble Scalar Data" />
       </Hints>
     </SourceProxy>
   </ProxyGroup>

paraview/LDistance/LDistance.xml

@@ -110,7 +110,7 @@ for the L-infinity distance).
       </PropertyGroup>
 
       <Hints>
-        <ShowInMenu category="TTK - Scalar Data" />
+        <ShowInMenu category="TTK - Ensemble Scalar Data" />
       </Hints>
    </SourceProxy>
  </ProxyGroup>

paraview/patch/main.yml

@@ -79,7 +79,7 @@ jobs:
     - name: Install macOS dependencies
       run: |
         brew cask install xquartz
-        brew install wget python libomp mesa glew boost qt ninja
+        brew install wget python@3.8 libomp mesa glew boost qt ninja
 
     - name: Build patched ParaView & create package
       run: |