Merge pull request #575 from alicevision/build/qtalicevision

Update Docker/CMake files to build the qtAliceVision plugin

Author: fabiencastan

CMakeLists.txt

@@ -10,6 +10,7 @@ set(QT_DIR "$ENV{QT_DIR}" CACHE STRING "Qt root directory")
 
 option(MR_BUILD_QTOIIO "Enable building of QtOIIO plugin" ON)
 option(MR_BUILD_QMLALEMBIC "Enable building of qmlAlembic plugin" ON)
+option(MR_BUILD_QTALICEVISION "Enable building of qtAliceVision plugin" ON)
 
 if(CMAKE_BUILD_TYPE MATCHES Release)
     message(STATUS "Force CMAKE_INSTALL_DO_STRIP in Release")
@@ -30,7 +31,6 @@ set(ALEMBIC_CMAKE_FLAGS
   -DAlembic_DIR:PATH=${ALICEVISION_ROOT}/lib64/cmake/Alembic
   -DILMBASE_ROOT=${ALICEVISION_ROOT}
 )
-set(QT_CMAKE_FLAGS -DCMAKE_PREFIX_PATH=${QT_DIR})
 
 
 include(ExternalProject)
@@ -44,7 +44,7 @@ include(GNUInstallDirs)
 # message(STATUS "QT_CMAKE_FLAGS: ${QT_CMAKE_FLAGS}")
 
 if(MR_BUILD_QTOIIO)
-set(QTOIIO_TARGET qtoiio)
+set(QTOIIO_TARGET qtOIIO)
 ExternalProject_Add(${QTOIIO_TARGET}
       GIT_REPOSITORY https://github.com/alicevision/QtOIIO
       GIT_TAG develop
@@ -54,13 +54,13 @@ ExternalProject_Add(${QTOIIO_TARGET}
       SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/qtoiio
       BINARY_DIR ${BUILD_DIR}/qtoiio_build
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-      CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${OIIO_CMAKE_FLAGS} ${QT_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
+      CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${OIIO_CMAKE_FLAGS} -DCMAKE_PREFIX_PATH:PATH=${QT_DIR} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
       )
 endif()
 
 
 if(MR_BUILD_QMLALEMBIC)
-set(QMLALEMBIC_TARGET qmlalembic)
+set(QMLALEMBIC_TARGET qmlAlembic)
 ExternalProject_Add(${QMLALEMBIC_TARGET}
       GIT_REPOSITORY https://github.com/alicevision/qmlAlembic
       GIT_TAG develop
@@ -70,7 +70,22 @@ ExternalProject_Add(${QMLALEMBIC_TARGET}
       SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/qmlalembic
       BINARY_DIR ${BUILD_DIR}/qmlalembic_build
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-      CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${ALEMBIC_CMAKE_FLAGS} ${QT_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
+      CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${ALEMBIC_CMAKE_FLAGS} -DCMAKE_PREFIX_PATH:PATH=${QT_DIR} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
+      )
+endif()
+
+if(MR_BUILD_QTALICEVISION)
+set(QTALICEVISION_TARGET qtAliceVision)
+ExternalProject_Add(${QTALICEVISION_TARGET}
+      GIT_REPOSITORY https://github.com/alicevision/qtAliceVision
+      GIT_TAG develop
+      PREFIX ${BUILD_DIR}
+      BUILD_IN_SOURCE 0
+      BUILD_ALWAYS 0
+      SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/qtAliceVision
+      BINARY_DIR ${BUILD_DIR}/qtAliceVision_build
+      INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
+      CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${ALEMBIC_CMAKE_FLAGS} -DCMAKE_PREFIX_PATH:PATH=${QT_DIR}$<SEMICOLON>${ALICEVISION_ROOT} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
       )
 endif()
 

Dockerfile

@@ -1,6 +1,6 @@
-ARG CUDA_TAG=7.0
+ARG CUDA_TAG=8.0
 ARG OS_TAG=7
-FROM alicevision:centos${OS_TAG}-cuda${CUDA_TAG}
+FROM alicevision/alicevision:centos${OS_TAG}-cuda${CUDA_TAG}
 LABEL maintainer="AliceVision Team [email protected]"
 
 # Execute with nvidia docker (https://github.com/nvidia/nvidia-docker/wiki/Installation-(version-2.0))
@@ -9,10 +9,11 @@ LABEL maintainer="AliceVision Team [email protected]"
 ENV MESHROOM_DEV=/opt/Meshroom \
     MESHROOM_BUILD=/tmp/Meshroom_build \
     MESHROOM_BUNDLE=/opt/Meshroom_bundle \
-    QT_DIR=/opt/qt/5.11.1/gcc_64 \
+    QT_DIR=/opt/qt/5.13.0/gcc_64 \
     PATH="${PATH}:${MESHROOM_BUNDLE}"
 
-COPY . "${MESHROOM_DEV}"
+# Workaround for qmlAlembic/qtAliceVision builds: fuse lib/lib64 folders
+RUN cp -rf ${AV_INSTALL}/lib/* ${AV_INSTALL}/lib64 && rm -rf ${AV_INSTALL}/lib && ln -s ${AV_INSTALL}/lib64 ${AV_INSTALL}/lib
 
 # Install libs needed by Qt
 RUN yum install -y \
@@ -39,6 +40,8 @@ RUN yum install -y \
 RUN yum install -y centos-release-scl
 RUN yum install -y rh-python36
 
+COPY . "${MESHROOM_DEV}"
+
 # Install Meshroom requirements and freeze bundle
 RUN source scl_source enable rh-python36 && cd "${MESHROOM_DEV}" && pip install -r dev_requirements.txt -r requirements.txt && python setup.py install_exe -d "${MESHROOM_BUNDLE}" && \
     find ${MESHROOM_BUNDLE} -name "*Qt5Web*" -delete && \
@@ -52,17 +55,19 @@ RUN source scl_source enable rh-python36 && cd "${MESHROOM_DEV}" && pip install
 
 # Install Qt (to build plugins)
 WORKDIR /tmp/qt
+# Qt version in specified in docker/qt-installer-noninteractive.qs
 RUN curl -LO http://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run && \
     chmod u+x qt-unified-linux-x64-online.run && \
     ./qt-unified-linux-x64-online.run --verbose --platform minimal --script "${MESHROOM_DEV}/docker/qt-installer-noninteractive.qs" && \
     rm ./qt-unified-linux-x64-online.run
 
 WORKDIR ${MESHROOM_BUILD}
-# Temporary workaround for qmlAlembic build
-RUN rm -rf "${AV_INSTALL}/lib" && ln -s "${AV_INSTALL}/lib64" "${AV_INSTALL}/lib"
 
 # Build Meshroom plugins
 RUN cmake "${MESHROOM_DEV}" -DALICEVISION_ROOT="${AV_INSTALL}" -DQT_DIR="${QT_DIR}" -DCMAKE_INSTALL_PREFIX="${MESHROOM_BUNDLE}/qtPlugins"
+# RUN make -j8 qtOIIO
+# RUN make -j8 qmlAlembic
+# RUN make -j8 qtAliceVision
 RUN make -j8 && cd /tmp && rm -rf ${MESHROOM_BUILD}
 
 RUN mv "${AV_BUNDLE}" "${MESHROOM_BUNDLE}/aliceVision"

docker/qt-installer-noninteractive.qs

@@ -46,14 +46,14 @@ Controller.prototype.ComponentSelectionPageCallback = function() {
     widget.deselectAll();
 
     // widget.selectComponent("qt");
-    // widget.selectComponent("qt.qt5.5111");
-    widget.selectComponent("qt.qt5.5111.gcc_64");
-    // widget.selectComponent("qt.qt5.5111.qtscript");
-    // widget.selectComponent("qt.qt5.5111.qtscript.gcc_64");
-    // widget.selectComponent("qt.qt5.5111.qtwebengine");
-    // widget.selectComponent("qt.qt5.5111.qtwebengine.gcc_64");
-    // widget.selectComponent("qt.qt5.5111.qtwebglplugin");
-    // widget.selectComponent("qt.qt5.5111.qtwebglplugin.gcc_64");
+    // widget.selectComponent("qt.qt5.5130");
+    widget.selectComponent("qt.qt5.5130.gcc_64");
+    // widget.selectComponent("qt.qt5.5130.qtscript");
+    // widget.selectComponent("qt.qt5.5130.qtscript.gcc_64");
+    // widget.selectComponent("qt.qt5.5130.qtwebengine");
+    // widget.selectComponent("qt.qt5.5130.qtwebengine.gcc_64");
+    // widget.selectComponent("qt.qt5.5130.qtwebglplugin");
+    // widget.selectComponent("qt.qt5.5130.qtwebglplugin.gcc_64");
     // widget.selectComponent("qt.tools");
 
     gui.clickButton(buttons.NextButton);