Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cmake] propagate dependencies #1312

Merged
merged 3 commits into from
Dec 8, 2022
Merged

[cmake] propagate dependencies #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d56ba0
[cmake] add find_dependency to zlib
fabiencastan Dec 7, 2022
5da6cf5
[cmake] use find_dependency in config
fabiencastan Dec 7, 2022
a2d4ee8
[cmake] zlib dependency is already added as target
fabiencastan Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/aliceVision/mvsData/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,4 @@ alicevision_add_library(aliceVision_mvsData
Boost::boost
OpenImageIO::OpenImageIO
OpenImageIO::OpenImageIO_Util
PUBLIC_INCLUDE_DIRS
${ZLIB_INCLUDE_DIR}
)
11 changes: 8 additions & 3 deletions src/cmake/AliceVisionConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,14 @@ endif()

set(ALICEVISION_BUILD_SFM @ALICEVISION_BUILD_SFM@)
if(ALICEVISION_BUILD_SFM)
find_package(CoinUtils REQUIRED)
find_package(Clp REQUIRED)
find_package(Osi REQUIRED)
find_dependency(CoinUtils REQUIRED)
find_dependency(Clp REQUIRED)
find_dependency(Osi REQUIRED)
endif()

set(ALICEVISION_BUILD_MVS @ALICEVISION_BUILD_MVS@)
if(ALICEVISION_BUILD_MVS)
find_dependency(ZLIB REQUIRED)
endif()

# propagate other building options
Expand Down