Merge pull request #50 from scharlton2/vtk-9.1.0

Compiles with VTK 9.1.0
MODFLOW-USGS · Jun 24, 2022 · 22043ea · 22043ea
2 parents 65a60ac + 70ada41
commit 22043ea
Show file tree

Hide file tree

Showing 42 changed files with 1,735 additions and 290 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
-misc/0001-update-for-memory-leaks.patch      text eol=lf
+misc/0001-update-for-memory-leaks.patch      text eol=lf
+*.ipynb                                      text eol=lf
diff --git a/.github/workflows/build-vtk-leaks.yml b/.github/workflows/build-vtk-leaks.yml
@@ -25,6 +25,33 @@ jobs:
 
       - uses: actions/checkout@v2
 
+      - name: Install vs2017 build tools
+        shell: pwsh
+        run: |
+          $downloaded = $false
+          while (-Not $downloaded) {
+            try {
+              Invoke-WebRequest "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "$env:TEMP\vs_buildtools.exe" -UseBasicParsing
+              $downloaded = $true
+            }
+            catch {
+              Write-Output "Retry"
+            }
+          }
+          $arg = @(
+              "--add", "Microsoft.VisualStudio.Workload.VCTools", `
+              "--add", "Microsoft.VisualStudio.Workload.MSBuildTools", `
+              "--add", "Microsoft.VisualStudio.Component.VC.ATL", `
+              "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
+              "--includeRecommended", `
+              "--passive", `
+              "--wait", `
+              "--norestart", `
+              "--noUpdateInstaller"
+          )
+          $process = Start-Process -FilePath $env:TEMP\vs_buildtools.exe -ArgumentList $arg -Wait -PassThru
+          Write-Output $process.ExitCode
+
       - name: Export env
         env:
           type:     debug
@@ -123,6 +150,33 @@ jobs:
 
       - uses: actions/checkout@v2
 
+      - name: Install vs2017 build tools
+        shell: pwsh
+        run: |
+          $downloaded = $false
+          while (-Not $downloaded) {
+            try {
+              Invoke-WebRequest "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "$env:TEMP\vs_buildtools.exe" -UseBasicParsing
+              $downloaded = $true
+            }
+            catch {
+              Write-Output "Retry"
+            }
+          }
+          $arg = @(
+              "--add", "Microsoft.VisualStudio.Workload.VCTools", `
+              "--add", "Microsoft.VisualStudio.Workload.MSBuildTools", `
+              "--add", "Microsoft.VisualStudio.Component.VC.ATL", `
+              "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
+              "--includeRecommended", `
+              "--passive", `
+              "--wait", `
+              "--norestart", `
+              "--noUpdateInstaller"
+          )
+          $process = Start-Process -FilePath $env:TEMP\vs_buildtools.exe -ArgumentList $arg -Wait -PassThru
+          Write-Output $process.ExitCode
+
       - name: Export env
         env:
           type:     release

diff --git a/.github/workflows/build-vtk.yml b/.github/workflows/build-vtk.yml
@@ -25,6 +25,33 @@ jobs:
 
       - uses: actions/checkout@v2
 
+      - name: Install vs2017 build tools
+        shell: pwsh
+        run: |
+          $downloaded = $false
+          while (-Not $downloaded) {
+            try {
+              Invoke-WebRequest "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "$env:TEMP\vs_buildtools.exe" -UseBasicParsing
+              $downloaded = $true
+            }
+            catch {
+              Write-Output "Retry"
+            }
+          }
+          $arg = @(
+              "--add", "Microsoft.VisualStudio.Workload.VCTools", `
+              "--add", "Microsoft.VisualStudio.Workload.MSBuildTools", `
+              "--add", "Microsoft.VisualStudio.Component.VC.ATL", `
+              "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
+              "--includeRecommended", `
+              "--passive", `
+              "--wait", `
+              "--norestart", `
+              "--noUpdateInstaller"
+          )
+          $process = Start-Process -FilePath $env:TEMP\vs_buildtools.exe -ArgumentList $arg -Wait -PassThru
+          Write-Output $process.ExitCode
+
       - name: Export env
         env:
           type:     debug
@@ -110,6 +137,33 @@ jobs:
 
       - uses: actions/checkout@v2
 
+      - name: Install vs2017 build tools
+        shell: pwsh
+        run: |
+          $downloaded = $false
+          while (-Not $downloaded) {
+            try {
+              Invoke-WebRequest "https://aka.ms/vs/15/release/vs_buildtools.exe" -OutFile "$env:TEMP\vs_buildtools.exe" -UseBasicParsing
+              $downloaded = $true
+            }
+            catch {
+              Write-Output "Retry"
+            }
+          }
+          $arg = @(
+              "--add", "Microsoft.VisualStudio.Workload.VCTools", `
+              "--add", "Microsoft.VisualStudio.Workload.MSBuildTools", `
+              "--add", "Microsoft.VisualStudio.Component.VC.ATL", `
+              "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
+              "--includeRecommended", `
+              "--passive", `
+              "--wait", `
+              "--norestart", `
+              "--noUpdateInstaller"
+          )
+          $process = Start-Process -FilePath $env:TEMP\vs_buildtools.exe -ArgumentList $arg -Wait -PassThru
+          Write-Output $process.ExitCode
+
       - name: Export env
         env:
           type:     release