mirror of
https://github.com/alicevision/Meshroom.git
synced 2025-04-29 18:27:23 +02:00
remove references to qtOIIO plugin in build and install process
This commit is contained in:
parent
9931459cdb
commit
d78c42db4d
6 changed files with 0 additions and 42 deletions
|
@ -8,7 +8,6 @@ endif()
|
||||||
set(ALICEVISION_ROOT "$ENV{ALICEVISION_ROOT}" CACHE STRING "AliceVision root dir")
|
set(ALICEVISION_ROOT "$ENV{ALICEVISION_ROOT}" CACHE STRING "AliceVision root dir")
|
||||||
set(QT_DIR "$ENV{QT_DIR}" CACHE STRING "Qt root directory")
|
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_QMLALEMBIC "Enable building of qmlAlembic plugin" ON)
|
||||||
option(MR_BUILD_QTALICEVISION "Enable building of qtAliceVision plugin" ON)
|
option(MR_BUILD_QTALICEVISION "Enable building of qtAliceVision plugin" ON)
|
||||||
|
|
||||||
|
@ -43,22 +42,6 @@ include(GNUInstallDirs)
|
||||||
|
|
||||||
# message(STATUS "QT_CMAKE_FLAGS: ${QT_CMAKE_FLAGS}")
|
# message(STATUS "QT_CMAKE_FLAGS: ${QT_CMAKE_FLAGS}")
|
||||||
|
|
||||||
if(MR_BUILD_QTOIIO)
|
|
||||||
set(QTOIIO_TARGET qtOIIO)
|
|
||||||
ExternalProject_Add(${QTOIIO_TARGET}
|
|
||||||
GIT_REPOSITORY https://github.com/alicevision/QtOIIO
|
|
||||||
GIT_TAG develop
|
|
||||||
PREFIX ${BUILD_DIR}
|
|
||||||
BUILD_IN_SOURCE 0
|
|
||||||
BUILD_ALWAYS 0
|
|
||||||
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} -DCMAKE_PREFIX_PATH:PATH=${QT_DIR} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
|
|
||||||
if(MR_BUILD_QMLALEMBIC)
|
if(MR_BUILD_QMLALEMBIC)
|
||||||
set(QMLALEMBIC_TARGET qmlAlembic)
|
set(QMLALEMBIC_TARGET qmlAlembic)
|
||||||
ExternalProject_Add(${QMLALEMBIC_TARGET}
|
ExternalProject_Add(${QMLALEMBIC_TARGET}
|
||||||
|
|
|
@ -24,8 +24,3 @@ Meshroom is licensed under the [MPL2 license](LICENSE-MPL2.md).
|
||||||
[https://github.com/alicevision/qmlAlembic](https://github.com/alicevision/qmlAlembic)
|
[https://github.com/alicevision/qmlAlembic](https://github.com/alicevision/qmlAlembic)
|
||||||
Copyright (c) 2018 AliceVision contributors.
|
Copyright (c) 2018 AliceVision contributors.
|
||||||
Distributed under the [MPL2 license](https://opensource.org/licenses/MPL-2.0).
|
Distributed under the [MPL2 license](https://opensource.org/licenses/MPL-2.0).
|
||||||
|
|
||||||
* __QtOIIO__
|
|
||||||
[https://github.com/alicevision/QtOIIO](https://github.com/alicevision/QtOIIO)
|
|
||||||
Copyright (c) 2018 AliceVision contributors.
|
|
||||||
Distributed under the [MPL2 license](https://opensource.org/licenses/MPL-2.0).
|
|
||||||
|
|
|
@ -48,14 +48,6 @@ Adds support for Alembic file loading in Meshroom's 3D viewport. Allows to visua
|
||||||
QML2_IMPORT_PATH=/path/to/qmlAlembic/install/qml
|
QML2_IMPORT_PATH=/path/to/qmlAlembic/install/qml
|
||||||
```
|
```
|
||||||
|
|
||||||
#### [QtOIIO](https://github.com/alicevision/QtOIIO)
|
|
||||||
Use OpenImageIO as backend to load images in Qt. Allow to visualize RAW/EXR images in Meshroom.
|
|
||||||
This plugin also provides a QML Qt3D Entity to load depthmaps files stored in EXR format.
|
|
||||||
```
|
|
||||||
QT_PLUGIN_PATH=/path/to/QtOIIO/install
|
|
||||||
QML2_IMPORT_PATH=/path/to/QtOIIO/install/qml
|
|
||||||
```
|
|
||||||
|
|
||||||
#### [QtAliceVision](https://github.com/alicevision/QtAliceVision)
|
#### [QtAliceVision](https://github.com/alicevision/QtAliceVision)
|
||||||
Use AliceVision to load and visualize intermediate reconstruction files.
|
Use AliceVision to load and visualize intermediate reconstruction files.
|
||||||
```
|
```
|
||||||
|
|
|
@ -42,8 +42,6 @@ WORKDIR ${MESHROOM_BUILD}
|
||||||
|
|
||||||
# Build Meshroom plugins
|
# Build Meshroom plugins
|
||||||
RUN cmake "${MESHROOM_DEV}" -DALICEVISION_ROOT="${AV_INSTALL}" -DCMAKE_INSTALL_PREFIX="${MESHROOM_BUNDLE}/qtPlugins"
|
RUN cmake "${MESHROOM_DEV}" -DALICEVISION_ROOT="${AV_INSTALL}" -DCMAKE_INSTALL_PREFIX="${MESHROOM_BUNDLE}/qtPlugins"
|
||||||
RUN make "-j$(nproc)" qtOIIO
|
|
||||||
|
|
||||||
RUN make "-j$(nproc)" qmlAlembic
|
RUN make "-j$(nproc)" qmlAlembic
|
||||||
RUN make "-j$(nproc)" qtAliceVision
|
RUN make "-j$(nproc)" qtAliceVision
|
||||||
RUN make "-j$(nproc)" && \
|
RUN make "-j$(nproc)" && \
|
||||||
|
|
|
@ -42,7 +42,6 @@ WORKDIR ${MESHROOM_BUILD}
|
||||||
|
|
||||||
# Build Meshroom plugins
|
# Build Meshroom plugins
|
||||||
RUN cmake "${MESHROOM_DEV}" -DALICEVISION_ROOT="${AV_INSTALL}" -DCMAKE_INSTALL_PREFIX="${MESHROOM_BUNDLE}/qtPlugins"
|
RUN cmake "${MESHROOM_DEV}" -DALICEVISION_ROOT="${AV_INSTALL}" -DCMAKE_INSTALL_PREFIX="${MESHROOM_BUNDLE}/qtPlugins"
|
||||||
RUN make "-j$(nproc)" qtOIIO
|
|
||||||
RUN make "-j$(nproc)" qmlAlembic
|
RUN make "-j$(nproc)" qmlAlembic
|
||||||
RUN make "-j$(nproc)" qtAliceVision
|
RUN make "-j$(nproc)" qtAliceVision
|
||||||
RUN make "-j$(nproc)" && \
|
RUN make "-j$(nproc)" && \
|
||||||
|
|
|
@ -43,15 +43,6 @@ RUN apt-get update && \
|
||||||
systemd \
|
systemd \
|
||||||
ssh
|
ssh
|
||||||
|
|
||||||
# Disabled as QTOIIO requires ah least 5.13 (5.12 available in Ubuntu 20.04)
|
|
||||||
# qtdeclarative5-dev \
|
|
||||||
# qt3d-assimpsceneimport-plugin \
|
|
||||||
# qt3d-defaultgeometryloader-plugin \
|
|
||||||
# qt3d-gltfsceneio-plugin \
|
|
||||||
# qt3d-scene2d-plugin \
|
|
||||||
# qt53dextras5 \
|
|
||||||
# qt3d5-dev
|
|
||||||
|
|
||||||
|
|
||||||
RUN apt-get install -y --no-install-recommends \
|
RUN apt-get install -y --no-install-recommends \
|
||||||
software-properties-common
|
software-properties-common
|
||||||
|
|
Loading…
Add table
Reference in a new issue