Merge pull request #1312 from alicevision/cmake/propagateDeps

[cmake] propagate dependencies
alicevision · Dec 8, 2022 · c8d74b8 · c8d74b8
2 parents 6b58d78 + a2d4ee8
commit c8d74b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/aliceVision/mvsData/CMakeLists.txt b/src/aliceVision/mvsData/CMakeLists.txt
@@ -39,6 +39,4 @@ alicevision_add_library(aliceVision_mvsData
     Boost::boost
     OpenImageIO::OpenImageIO
     OpenImageIO::OpenImageIO_Util
-  PUBLIC_INCLUDE_DIRS
-    ${ZLIB_INCLUDE_DIR}
 )
diff --git a/src/cmake/AliceVisionConfig.cmake.in b/src/cmake/AliceVisionConfig.cmake.in
@@ -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