From e2fc3f1e0c55db903740b4dca5a7822150f625d9 Mon Sep 17 00:00:00 2001
From: Caleb Schilly <cwschilly@gmail.com>
Date: Wed, 10 Jul 2024 13:34:13 -0400
Subject: [PATCH] #2174: fix vtk.sh script

---
 ci/deps/vtk.sh                      | 31 +++++++++++++++++++----------
 ci/docker/ubuntu-gnu-cpp.dockerfile |  3 ++-
 2 files changed, 22 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 ci/deps/vtk.sh

diff --git a/ci/deps/vtk.sh b/ci/deps/vtk.sh
old mode 100644
new mode 100755
index 6cdcc6f0bf..2c72bbcea8
--- a/ci/deps/vtk.sh
+++ b/ci/deps/vtk.sh
@@ -2,28 +2,37 @@
 
 set -exo pipefail
 
-if test $# -lt 2
+if test $# -lt 3
 then
-    echo "usage: ./$0 <vtk-version> <installation-dir>"
+    echo "usage: ./$0 <vtk-version> <build-root> <num_procs>"
     exit 1
 fi
 
+base_dir=$(pwd)
+
 vtk_version="$1"
 vtk_tar_name="v${vtk_version}.tar.gz"
 vtk_name="VTK-${vtk_version}"
-install_dir="${2-}"
-build_dir=/vtk-build/
+build_root="${2-}"
+
+num_procs=$3
 
 wget "https://github.com/Kitware/VTK/archive/refs/tags/$vtk_tar_name"
 tar xzf ${vtk_tar_name}
 rm ${vtk_tar_name}
-cd ${vtk_name}
 
-mkdir -p ${build_dir}
-mkdir -p ${install_dir}
+mkdir -p ${build_root}
+cd ${build_root}
 
-cd ${build_dir}
+mkdir -p build
+mkdir -p install
+
+cd build
+rm -rf ./*
 cmake \
-  -DCMAKE_INSTALL_PREFIX:FILEPATH=${install_dir} \
-  ../${vtk_name}
-cmake --build ${build_dir} --target install
+  -DCMAKE_INSTALL_PREFIX:FILEPATH=${build_root}/install \
+  ${base_dir}/${vtk_name}
+cmake --build . --target install -j ${num_procs}
+
+cd ${base_dir}
+rm -rf ${vtk_name}
diff --git a/ci/docker/ubuntu-gnu-cpp.dockerfile b/ci/docker/ubuntu-gnu-cpp.dockerfile
index 2c0cbe56a6..280b8c249f 100644
--- a/ci/docker/ubuntu-gnu-cpp.dockerfile
+++ b/ci/docker/ubuntu-gnu-cpp.dockerfile
@@ -71,7 +71,8 @@ ENV LESSCHARSET=utf-8
 
 COPY ./ci/deps/vtk.sh vtk.sh
 RUN if [ "$VT_TV_ENABLED" -eq 1]; then \
-      ./vtk.sh 9.3.0 /vtk-install; \
+      chmod +x vtk.sh && \
+      ./vtk.sh 9.3.0 /vtk-install 4; \
     fi
 
 COPY ./ci/deps/mpich.sh mpich.sh