#2174: use vtk install dir instead of build dir

DARMA-tasking · Sep 17, 2024 · 7d63592 · 7d63592
1 parent ef4b213
commit 7d63592
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/ci/deps/vtk.sh b/ci/deps/vtk.sh
@@ -23,9 +23,16 @@ rm ${vtk_tar_name}
 
 mkdir -p ${build_root}
 cd ${build_root}
-rm -rf ./*
-cmake ${base_dir}/${vtk_name}
-cmake --build . -j ${make_args}
+
+mkdir -p build
+mkdir -p install
+
+cd build
+cmake \
+    -DCMAKE_INSTALL_PREFIX:FILEPATH=${build_root}/install \
+    ${base_dir}/${vtk_name}
+cmake --build . --target install -j ${make_args}
 
 cd ${base_dir}
 rm -rf ${vtk_name}
+rm -rf ${build_root}/build
diff --git a/ci/docker/ubuntu-gnu-vtk-cpp.dockerfile b/ci/docker/ubuntu-gnu-vtk-cpp.dockerfile
@@ -71,7 +71,7 @@ ENV LESSCHARSET=utf-8
 
 COPY ./ci/deps/vtk.sh vtk.sh
 RUN chmod +x vtk.sh && ./vtk.sh 9.3.0 /vtk-build -j4
-ENV VTK_DIR=/vtk-build
+ENV VTK_DIR=/vtk-build/install/lib/cmake/vtk-9.3
 
 COPY ./ci/deps/mpich.sh mpich.sh
 RUN if [ "$ubuntu" = "18.04" ]; then \