From 2fb3b3046a8cef9b2ea20bc8d2ea5ba828b5da4d Mon Sep 17 00:00:00 2001 From: Caleb Schilly Date: Wed, 11 Sep 2024 11:03:32 -0400 Subject: [PATCH] #2174: use vtk install dir instead of build dir --- ci/deps/vtk.sh | 13 ++++++++++--- ci/docker/ubuntu-gnu-vtk-cpp.dockerfile | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ci/deps/vtk.sh b/ci/deps/vtk.sh index 9317b4f909..c0a515925a 100755 --- 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 index eab2512a46..2ba34f3a53 100644 --- 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 \