From d277d79feb2723a0451e5213aeec488faa9016f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candice=20Bent=C3=A9jac?= Date: Tue, 25 Jul 2023 12:29:05 +0200 Subject: [PATCH] [docker] Remove QmlAlembic build and references to it --- docker/Dockerfile_centos | 3 +-- docker/Dockerfile_ubuntu | 3 +-- docker/Dockerfile_ubuntu_deps | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile_centos b/docker/Dockerfile_centos index d5546ac7..72a071a0 100644 --- a/docker/Dockerfile_centos +++ b/docker/Dockerfile_centos @@ -24,8 +24,7 @@ WORKDIR ${MESHROOM_BUILD} # Build Meshroom plugins RUN cmake "${MESHROOM_DEV}" -DCMAKE_PREFIX_PATH="${AV_INSTALL}" -DALICEVISION_ROOT="${AV_INSTALL}" -DCMAKE_INSTALL_PREFIX="${MESHROOM_BUNDLE}/qtPlugins" -RUN make "-j$(nproc)" qmlAlembic -RUN make "-j$(nproc)" qtAliceVision +RUN make "-j$(nproc)" QtAliceVision RUN make "-j$(nproc)" && \ rm -rf "${MESHROOM_BUILD}" "${MESHROOM_DEV}" \ ${MESHROOM_BUNDLE}/aliceVision/share/doc \ diff --git a/docker/Dockerfile_ubuntu b/docker/Dockerfile_ubuntu index 55fae60f..c8bc8f7a 100644 --- a/docker/Dockerfile_ubuntu +++ b/docker/Dockerfile_ubuntu @@ -42,8 +42,7 @@ WORKDIR ${MESHROOM_BUILD} # Build Meshroom plugins RUN cmake "${MESHROOM_DEV}" -DALICEVISION_ROOT="${AV_INSTALL}" -DCMAKE_INSTALL_PREFIX="${MESHROOM_BUNDLE}/qtPlugins" -RUN make "-j$(nproc)" qmlAlembic -RUN make "-j$(nproc)" qtAliceVision +RUN make "-j$(nproc)" QtAliceVision RUN make "-j$(nproc)" && \ rm -rf "${MESHROOM_BUILD}" "${MESHROOM_DEV}" \ ${MESHROOM_BUNDLE}/aliceVision/share/doc \ diff --git a/docker/Dockerfile_ubuntu_deps b/docker/Dockerfile_ubuntu_deps index 438f1d45..2e77093b 100644 --- a/docker/Dockerfile_ubuntu_deps +++ b/docker/Dockerfile_ubuntu_deps @@ -13,7 +13,7 @@ ENV MESHROOM_DEV=/opt/Meshroom \ QT_CI_LOGIN=alicevisionjunk@gmail.com \ QT_CI_P=azerty1. -# Workaround for qmlAlembic/qtAliceVision builds: fuse lib/lib64 folders +# Workaround for QtAliceVision builds: fuse lib/lib64 folders #RUN ln -s ${AV_INSTALL}/lib ${AV_INSTALL}/lib64 # Install libs needed by Qt