Skip to content

Commit 3c39c81

Browse files
committed
[build] CMakeLists: Remove QmlAlembic option
QmlAlembic has been merged into QtAliceVision, so only QtAliceVision needs to remain.
1 parent 24b60b3 commit 3c39c81

File tree

1 file changed

+5
-21
lines changed

1 file changed

+5
-21
lines changed

CMakeLists.txt

+5-21
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ endif()
88
set(ALICEVISION_ROOT "$ENV{ALICEVISION_ROOT}" CACHE STRING "AliceVision root dir")
99
set(QT_DIR "$ENV{QT_DIR}" CACHE STRING "Qt root directory")
1010

11-
option(MR_BUILD_QMLALEMBIC "Enable building of qmlAlembic plugin" ON)
12-
option(MR_BUILD_QTALICEVISION "Enable building of qtAliceVision plugin" ON)
11+
option(MR_BUILD_QTALICEVISION "Enable building of QtAliceVision plugin" ON)
1312

1413
if(CMAKE_BUILD_TYPE MATCHES Release)
1514
message(STATUS "Force CMAKE_INSTALL_DO_STRIP in Release")
@@ -36,31 +35,16 @@ include(GNUInstallDirs)
3635

3736
# message(STATUS "QT_CMAKE_FLAGS: ${QT_CMAKE_FLAGS}")
3837

39-
if(MR_BUILD_QMLALEMBIC)
40-
set(QMLALEMBIC_TARGET qmlAlembic)
41-
ExternalProject_Add(${QMLALEMBIC_TARGET}
42-
GIT_REPOSITORY https://github.com/alicevision/qmlAlembic
43-
GIT_TAG develop
44-
PREFIX ${BUILD_DIR}
45-
BUILD_IN_SOURCE 0
46-
BUILD_ALWAYS 0
47-
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/qmlAlembic
48-
BINARY_DIR ${BUILD_DIR}/qmlAlembic_build
49-
INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
50-
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>
51-
)
52-
endif()
53-
5438
if(MR_BUILD_QTALICEVISION)
55-
set(QTALICEVISION_TARGET qtAliceVision)
39+
set(QTALICEVISION_TARGET QtAliceVision)
5640
ExternalProject_Add(${QTALICEVISION_TARGET}
57-
GIT_REPOSITORY https://github.com/alicevision/qtAliceVision
41+
GIT_REPOSITORY https://github.com/alicevision/QtAliceVision
5842
GIT_TAG develop
5943
PREFIX ${BUILD_DIR}
6044
BUILD_IN_SOURCE 0
6145
BUILD_ALWAYS 0
62-
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/qtAliceVision
63-
BINARY_DIR ${BUILD_DIR}/qtAliceVision_build
46+
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/QtAliceVision
47+
BINARY_DIR ${BUILD_DIR}/QtAliceVision_build
6448
INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
6549
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>
6650
)

0 commit comments

Comments
 (0)