From 98b3b36411ed143da0feb0dc4071ac1e7636b2fa Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 2 Apr 2025 02:59:02 +0200 Subject: [PATCH] Refactor: Build: Add bf::dependencies::eigen target To make adding a dependeny on TBB easier. Additional changes: * Using LIB for libmv tests, as it now brings in includes * Removing Eigen header listing in iTaSC Pull Request: https://projects.blender.org/blender/blender/pulls/136865 --- .../cmake/platform/dependency_targets.cmake | 9 + extern/ceres/CMakeLists.txt | 3 +- intern/dualcon/CMakeLists.txt | 2 +- intern/eigen/CMakeLists.txt | 2 +- intern/ghost/CMakeLists.txt | 2 +- intern/iksolver/CMakeLists.txt | 2 +- intern/itasc/CMakeLists.txt | 349 +----------------- intern/libmv/CMakeLists.txt | 69 ++-- intern/quadriflow/CMakeLists.txt | 2 +- intern/slim/CMakeLists.txt | 2 +- source/blender/blenlib/CMakeLists.txt | 2 +- source/blender/ikplugin/CMakeLists.txt | 1 - source/blender/render/hydra/CMakeLists.txt | 2 +- source/blender/simulation/CMakeLists.txt | 2 +- 14 files changed, 56 insertions(+), 393 deletions(-) diff --git a/build_files/cmake/platform/dependency_targets.cmake b/build_files/cmake/platform/dependency_targets.cmake index d8623be7972..b08acc0f952 100644 --- a/build_files/cmake/platform/dependency_targets.cmake +++ b/build_files/cmake/platform/dependency_targets.cmake @@ -22,3 +22,12 @@ if(WITH_TBB) target_include_directories(bf_deps_optional_tbb SYSTEM INTERFACE ${TBB_INCLUDE_DIRS}) target_link_libraries(bf_deps_optional_tbb INTERFACE ${TBB_LIBRARIES}) endif() + + +# ----------------------------------------------------------------------------- +# Configure Eigen + +add_library(bf_deps_eigen INTERFACE) +add_library(bf::dependencies::eigen ALIAS bf_deps_eigen) + +target_include_directories(bf_deps_eigen SYSTEM INTERFACE ${EIGEN3_INCLUDE_DIRS}) diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt index 3f83cd09637..c5965ce6d5c 100644 --- a/extern/ceres/CMakeLists.txt +++ b/extern/ceres/CMakeLists.txt @@ -10,7 +10,6 @@ set(INC ) set(INC_SYS - ${EIGEN3_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS} ${GLOG_INCLUDE_DIRS} ) @@ -314,6 +313,8 @@ set(SRC set(LIB ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES} + + PRIVATE bf::dependencies::eigen ) if(WITH_LIBMV_SCHUR_SPECIALIZATIONS) diff --git a/intern/dualcon/CMakeLists.txt b/intern/dualcon/CMakeLists.txt index 68f19fa559c..5b17ac14b53 100644 --- a/intern/dualcon/CMakeLists.txt +++ b/intern/dualcon/CMakeLists.txt @@ -9,7 +9,6 @@ set(INC ) set(INC_SYS - ${EIGEN3_INCLUDE_DIRS} ) set(SRC @@ -33,6 +32,7 @@ set(SRC ) set(LIB + PRIVATE bf::dependencies::eigen ) blender_add_lib(bf_intern_dualcon "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/eigen/CMakeLists.txt b/intern/eigen/CMakeLists.txt index 8ccd0ff3aeb..8e833677ae1 100644 --- a/intern/eigen/CMakeLists.txt +++ b/intern/eigen/CMakeLists.txt @@ -7,7 +7,6 @@ set(INC ) set(INC_SYS - ${EIGEN3_INCLUDE_DIRS} ) set(SRC @@ -25,6 +24,7 @@ set(SRC ) set(LIB + PRIVATE bf::dependencies::eigen ) if(WITH_OPENMP AND WITH_OPENMP_STATIC) diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index ba847c60809..a5a5a2a6c57 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -596,11 +596,11 @@ if(WITH_XR_OPENXR) ../../extern/tinygltf ) list(APPEND INC_SYS - ${EIGEN3_INCLUDE_DIRS} ${XR_OPENXR_SDK_INCLUDE_DIR} ) list(APPEND LIB ${XR_OPENXR_SDK_LIBRARIES} + PRIVATE bf::dependencies::eigen ) set(XR_PLATFORM_DEFINES diff --git a/intern/iksolver/CMakeLists.txt b/intern/iksolver/CMakeLists.txt index 50f6a6c6cf5..01d81c31b06 100644 --- a/intern/iksolver/CMakeLists.txt +++ b/intern/iksolver/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC ) set(INC_SYS - ${EIGEN3_INCLUDE_DIRS} ) if(WIN32) @@ -31,6 +30,7 @@ set(SRC ) set(LIB + PRIVATE bf::dependencies::eigen ) blender_add_lib(bf_intern_iksolver "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt index 855e44e8fca..d17b3ff0b29 100644 --- a/intern/itasc/CMakeLists.txt +++ b/intern/itasc/CMakeLists.txt @@ -8,352 +8,8 @@ set(INC ) set(INC_SYS - ${EIGEN3_INCLUDE_DIRS} ) -if(NOT WITH_SYSTEM_EIGEN3) - set(EIGEN3_HEADERS - # until we have another user... - ../../extern/Eigen3/Eigen/Cholesky - ../../extern/Eigen3/Eigen/CholmodSupport - ../../extern/Eigen3/Eigen/Core - ../../extern/Eigen3/Eigen/Dense - ../../extern/Eigen3/Eigen/Eigen - ../../extern/Eigen3/Eigen/Eigenvalues - ../../extern/Eigen3/Eigen/Geometry - ../../extern/Eigen3/Eigen/Householder - ../../extern/Eigen3/Eigen/IterativeLinearSolvers - ../../extern/Eigen3/Eigen/Jacobi - ../../extern/Eigen3/Eigen/KLUSupport - ../../extern/Eigen3/Eigen/LU - ../../extern/Eigen3/Eigen/MetisSupport - ../../extern/Eigen3/Eigen/OrderingMethods - ../../extern/Eigen3/Eigen/PaStiXSupport - ../../extern/Eigen3/Eigen/PardisoSupport - ../../extern/Eigen3/Eigen/QR - ../../extern/Eigen3/Eigen/QtAlignedMalloc - ../../extern/Eigen3/Eigen/SPQRSupport - ../../extern/Eigen3/Eigen/SVD - ../../extern/Eigen3/Eigen/Sparse - ../../extern/Eigen3/Eigen/SparseCholesky - ../../extern/Eigen3/Eigen/SparseCore - ../../extern/Eigen3/Eigen/SparseLU - ../../extern/Eigen3/Eigen/SparseQR - ../../extern/Eigen3/Eigen/StdDeque - ../../extern/Eigen3/Eigen/StdList - ../../extern/Eigen3/Eigen/StdVector - ../../extern/Eigen3/Eigen/SuperLUSupport - ../../extern/Eigen3/Eigen/UmfPackSupport - ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h - ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h - ../../extern/Eigen3/Eigen/src/Cholesky/LLT_LAPACKE.h - ../../extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h - ../../extern/Eigen3/Eigen/src/Core/ArithmeticSequence.h - ../../extern/Eigen3/Eigen/src/Core/Array.h - ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h - ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h - ../../extern/Eigen3/Eigen/src/Core/Assign.h - ../../extern/Eigen3/Eigen/src/Core/AssignEvaluator.h - ../../extern/Eigen3/Eigen/src/Core/Assign_MKL.h - ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h - ../../extern/Eigen3/Eigen/src/Core/Block.h - ../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h - ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h - ../../extern/Eigen3/Eigen/src/Core/ConditionEstimator.h - ../../extern/Eigen3/Eigen/src/Core/CoreEvaluators.h - ../../extern/Eigen3/Eigen/src/Core/CoreIterators.h - ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h - ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h - ../../extern/Eigen3/Eigen/src/Core/CwiseTernaryOp.h - ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h - ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h - ../../extern/Eigen3/Eigen/src/Core/DenseBase.h - ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h - ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h - ../../extern/Eigen3/Eigen/src/Core/Diagonal.h - ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h - ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h - ../../extern/Eigen3/Eigen/src/Core/Dot.h - ../../extern/Eigen3/Eigen/src/Core/EigenBase.h - ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h - ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h - ../../extern/Eigen3/Eigen/src/Core/GeneralProduct.h - ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h - ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h - ../../extern/Eigen3/Eigen/src/Core/IO.h - ../../extern/Eigen3/Eigen/src/Core/IndexedView.h - ../../extern/Eigen3/Eigen/src/Core/Inverse.h - ../../extern/Eigen3/Eigen/src/Core/Map.h - ../../extern/Eigen3/Eigen/src/Core/MapBase.h - ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/MathFunctionsImpl.h - ../../extern/Eigen3/Eigen/src/Core/Matrix.h - ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h - ../../extern/Eigen3/Eigen/src/Core/NestByValue.h - ../../extern/Eigen3/Eigen/src/Core/NoAlias.h - ../../extern/Eigen3/Eigen/src/Core/NumTraits.h - ../../extern/Eigen3/Eigen/src/Core/PartialReduxEvaluator.h - ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h - ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h - ../../extern/Eigen3/Eigen/src/Core/Product.h - ../../extern/Eigen3/Eigen/src/Core/ProductEvaluators.h - ../../extern/Eigen3/Eigen/src/Core/Random.h - ../../extern/Eigen3/Eigen/src/Core/Redux.h - ../../extern/Eigen3/Eigen/src/Core/Ref.h - ../../extern/Eigen3/Eigen/src/Core/Replicate.h - ../../extern/Eigen3/Eigen/src/Core/Reshaped.h - ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h - ../../extern/Eigen3/Eigen/src/Core/Reverse.h - ../../extern/Eigen3/Eigen/src/Core/Select.h - ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h - ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h - ../../extern/Eigen3/Eigen/src/Core/Solve.h - ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h - ../../extern/Eigen3/Eigen/src/Core/SolverBase.h - ../../extern/Eigen3/Eigen/src/Core/StableNorm.h - ../../extern/Eigen3/Eigen/src/Core/StlIterators.h - ../../extern/Eigen3/Eigen/src/Core/Stride.h - ../../extern/Eigen3/Eigen/src/Core/Swap.h - ../../extern/Eigen3/Eigen/src/Core/Transpose.h - ../../extern/Eigen3/Eigen/src/Core/Transpositions.h - ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h - ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h - ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h - ../../extern/Eigen3/Eigen/src/Core/Visitor.h - ../../extern/Eigen3/Eigen/src/Core/arch/AVX/Complex.h - ../../extern/Eigen3/Eigen/src/Core/arch/AVX/MathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/arch/AVX/PacketMath.h - ../../extern/Eigen3/Eigen/src/Core/arch/AVX/TypeCasting.h - ../../extern/Eigen3/Eigen/src/Core/arch/AVX512/Complex.h - ../../extern/Eigen3/Eigen/src/Core/arch/AVX512/MathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/arch/AVX512/PacketMath.h - ../../extern/Eigen3/Eigen/src/Core/arch/AVX512/TypeCasting.h - ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h - ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/MathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/MatrixProduct.h - ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/MatrixProductCommon.h - ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/MatrixProductMMA.h - ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h - ../../extern/Eigen3/Eigen/src/Core/arch/CUDA/Complex.h - ../../extern/Eigen3/Eigen/src/Core/arch/Default/BFloat16.h - ../../extern/Eigen3/Eigen/src/Core/arch/Default/ConjHelper.h - ../../extern/Eigen3/Eigen/src/Core/arch/Default/GenericPacketMathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/arch/Default/GenericPacketMathFunctionsFwd.h - ../../extern/Eigen3/Eigen/src/Core/arch/Default/Half.h - ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h - ../../extern/Eigen3/Eigen/src/Core/arch/Default/TypeCasting.h - ../../extern/Eigen3/Eigen/src/Core/arch/GPU/MathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/arch/GPU/PacketMath.h - ../../extern/Eigen3/Eigen/src/Core/arch/GPU/TypeCasting.h - ../../extern/Eigen3/Eigen/src/Core/arch/HIP/hcc/math_constants.h - ../../extern/Eigen3/Eigen/src/Core/arch/MSA/Complex.h - ../../extern/Eigen3/Eigen/src/Core/arch/MSA/MathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/arch/MSA/PacketMath.h - ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h - ../../extern/Eigen3/Eigen/src/Core/arch/NEON/GeneralBlockPanelKernel.h - ../../extern/Eigen3/Eigen/src/Core/arch/NEON/MathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h - ../../extern/Eigen3/Eigen/src/Core/arch/NEON/TypeCasting.h - ../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h - ../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h - ../../extern/Eigen3/Eigen/src/Core/arch/SSE/TypeCasting.h - ../../extern/Eigen3/Eigen/src/Core/arch/SVE/MathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/arch/SVE/PacketMath.h - ../../extern/Eigen3/Eigen/src/Core/arch/SVE/TypeCasting.h - ../../extern/Eigen3/Eigen/src/Core/arch/SYCL/InteropHeaders.h - ../../extern/Eigen3/Eigen/src/Core/arch/SYCL/MathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/arch/SYCL/PacketMath.h - ../../extern/Eigen3/Eigen/src/Core/arch/SYCL/SyclMemoryModel.h - ../../extern/Eigen3/Eigen/src/Core/arch/SYCL/TypeCasting.h - ../../extern/Eigen3/Eigen/src/Core/arch/ZVector/Complex.h - ../../extern/Eigen3/Eigen/src/Core/arch/ZVector/MathFunctions.h - ../../extern/Eigen3/Eigen/src/Core/arch/ZVector/PacketMath.h - ../../extern/Eigen3/Eigen/src/Core/functors/AssignmentFunctors.h - ../../extern/Eigen3/Eigen/src/Core/functors/BinaryFunctors.h - ../../extern/Eigen3/Eigen/src/Core/functors/NullaryFunctors.h - ../../extern/Eigen3/Eigen/src/Core/functors/StlFunctors.h - ../../extern/Eigen3/Eigen/src/Core/functors/TernaryFunctors.h - ../../extern/Eigen3/Eigen/src/Core/functors/UnaryFunctors.h - ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h - ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h - ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h - ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_BLAS.h - ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix_BLAS.h - ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h - ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector_BLAS.h - ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h - ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h - ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix_BLAS.h - ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h - ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector_BLAS.h - ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h - ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h - ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h - ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_BLAS.h - ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h - ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector_BLAS.h - ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h - ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix_BLAS.h - ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h - ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h - ../../extern/Eigen3/Eigen/src/Core/util/ConfigureVectorization.h - ../../extern/Eigen3/Eigen/src/Core/util/Constants.h - ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h - ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h - ../../extern/Eigen3/Eigen/src/Core/util/IndexedViewHelper.h - ../../extern/Eigen3/Eigen/src/Core/util/IntegralConstant.h - ../../extern/Eigen3/Eigen/src/Core/util/MKL_support.h - ../../extern/Eigen3/Eigen/src/Core/util/Macros.h - ../../extern/Eigen3/Eigen/src/Core/util/Memory.h - ../../extern/Eigen3/Eigen/src/Core/util/Meta.h - ../../extern/Eigen3/Eigen/src/Core/util/NonMPL2.h - ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h - ../../extern/Eigen3/Eigen/src/Core/util/ReshapedHelper.h - ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h - ../../extern/Eigen3/Eigen/src/Core/util/SymbolicIndex.h - ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur_LAPACKE.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedEigenSolver.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/RealQZ.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur_LAPACKE.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h - ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h - ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h - ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h - ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h - ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h - ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h - ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h - ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h - ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h - ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h - ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h - ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h - ../../extern/Eigen3/Eigen/src/Geometry/Transform.h - ../../extern/Eigen3/Eigen/src/Geometry/Translation.h - ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h - ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SIMD.h - ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h - ../../extern/Eigen3/Eigen/src/Householder/Householder.h - ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h - ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h - ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h - ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h - ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h - ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h - ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h - ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h - ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h - ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h - ../../extern/Eigen3/Eigen/src/KLUSupport/KLUSupport.h - ../../extern/Eigen3/Eigen/src/LU/Determinant.h - ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h - ../../extern/Eigen3/Eigen/src/LU/InverseImpl.h - ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h - ../../extern/Eigen3/Eigen/src/LU/PartialPivLU_LAPACKE.h - ../../extern/Eigen3/Eigen/src/LU/arch/InverseSize4.h - ../../extern/Eigen3/Eigen/src/MetisSupport/MetisSupport.h - ../../extern/Eigen3/Eigen/src/OrderingMethods/Amd.h - ../../extern/Eigen3/Eigen/src/OrderingMethods/Eigen_Colamd.h - ../../extern/Eigen3/Eigen/src/OrderingMethods/Ordering.h - ../../extern/Eigen3/Eigen/src/PaStiXSupport/PaStiXSupport.h - ../../extern/Eigen3/Eigen/src/PardisoSupport/PardisoSupport.h - ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h - ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR_LAPACKE.h - ../../extern/Eigen3/Eigen/src/QR/CompleteOrthogonalDecomposition.h - ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h - ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h - ../../extern/Eigen3/Eigen/src/QR/HouseholderQR_LAPACKE.h - ../../extern/Eigen3/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h - ../../extern/Eigen3/Eigen/src/SVD/BDCSVD.h - ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h - ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD_LAPACKE.h - ../../extern/Eigen3/Eigen/src/SVD/SVDBase.h - ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h - ../../extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky.h - ../../extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky_impl.h - ../../extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h - ../../extern/Eigen3/Eigen/src/SparseCore/CompressedStorage.h - ../../extern/Eigen3/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h - ../../extern/Eigen3/Eigen/src/SparseCore/MappedSparseMatrix.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseAssign.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseBlock.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseColEtree.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseCompressedBase.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseBinaryOp.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseUnaryOp.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseDenseProduct.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseDiagonalProduct.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseDot.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseFuzzy.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseMap.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrix.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrixBase.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparsePermutation.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseProduct.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseRedux.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseRef.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseSolverBase.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseSparseProductWithPruning.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseTranspose.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseTriangularView.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseUtil.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseVector.h - ../../extern/Eigen3/Eigen/src/SparseCore/SparseView.h - ../../extern/Eigen3/Eigen/src/SparseCore/TriangularSolver.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLUImpl.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_Memory.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_Structs.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_Utils.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_column_bmod.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_column_dfs.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_copy_to_ucol.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_gemm_kernel.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_kernel_bmod.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_panel_bmod.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_panel_dfs.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_pivotL.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_pruneL.h - ../../extern/Eigen3/Eigen/src/SparseLU/SparseLU_relax_snode.h - ../../extern/Eigen3/Eigen/src/SparseQR/SparseQR.h - ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h - ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h - ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h - ../../extern/Eigen3/Eigen/src/StlSupport/details.h - ../../extern/Eigen3/Eigen/src/SuperLUSupport/SuperLUSupport.h - ../../extern/Eigen3/Eigen/src/UmfPackSupport/UmfPackSupport.h - ../../extern/Eigen3/Eigen/src/misc/Image.h - ../../extern/Eigen3/Eigen/src/misc/Kernel.h - ../../extern/Eigen3/Eigen/src/misc/RealSvd2x2.h - ../../extern/Eigen3/Eigen/src/misc/blas.h - ../../extern/Eigen3/Eigen/src/misc/lapack.h - ../../extern/Eigen3/Eigen/src/misc/lapacke.h - ../../extern/Eigen3/Eigen/src/misc/lapacke_mangling.h - ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h - ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h - ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h - ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h - ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h - ../../extern/Eigen3/Eigen/src/plugins/IndexedViewMethods.h - ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h - ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h - ../../extern/Eigen3/Eigen/src/plugins/ReshapedMethods.h - ) -endif() - set(SRC Armature.cpp Cache.cpp @@ -441,13 +97,10 @@ set(SRC kdl/frameacc.inl kdl/frames.inl kdl/framevel.inl - - ${EIGEN3_HEADERS} ) set(LIB + PUBLIC bf::dependencies::eigen ) -unset(EIGEN3_HEADERS) - blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt index 89128f63de6..1c9eddf6616 100644 --- a/intern/libmv/CMakeLists.txt +++ b/intern/libmv/CMakeLists.txt @@ -40,7 +40,6 @@ if(WITH_LIBMV) ) list(APPEND INC_SYS - ${EIGEN3_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ../../extern/ceres/include @@ -54,6 +53,8 @@ if(WITH_LIBMV) ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES} ${PNG_LIBRARIES} + + PRIVATE bf::dependencies::eigen ) add_definitions( @@ -204,40 +205,40 @@ if(WITH_LIBMV) if(WITH_GTESTS) - blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}" "") + blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}" "${LIB}") - blender_add_test_executable("libmv_predict_tracks" "./libmv/autotrack/predict_tracks_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_tracks" "./libmv/autotrack/tracks_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_scoped_ptr" "./libmv/base/scoped_ptr_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_vector" "./libmv/base/vector_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_array_nd" "./libmv/image/array_nd_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_convolve" "./libmv/image/convolve_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_image" "./libmv/image/image_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_sample" "./libmv/image/sample_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_tuple" "./libmv/image/tuple_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_euclidean_resection" "./libmv/multiview/euclidean_resection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_fundamental" "./libmv/multiview/fundamental_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_homography" "./libmv/multiview/homography_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_nviewtriangulation" "./libmv/multiview/nviewtriangulation_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_panography" "./libmv/multiview/panography_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_projection" "./libmv/multiview/projection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_resection" "./libmv/multiview/resection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_triangulation" "./libmv/multiview/triangulation_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_dogleg" "./libmv/numeric/dogleg_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_function_derivative" "./libmv/numeric/function_derivative_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_levenberg_marquardt" "./libmv/numeric/levenberg_marquardt_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_numeric" "./libmv/numeric/numeric_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_poly" "./libmv/numeric/poly_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_camera_intrinsics" "./libmv/simple_pipeline/camera_intrinsics_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_detect" "./libmv/simple_pipeline/detect_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_intersect" "./libmv/simple_pipeline/intersect_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_keyframe_selection" "./libmv/simple_pipeline/keyframe_selection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_modal_solver" "./libmv/simple_pipeline/modal_solver_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_resect" "./libmv/simple_pipeline/resect_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_brute_region_tracker" "./libmv/tracking/brute_region_tracker_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_klt_region_tracker" "./libmv/tracking/klt_region_tracker_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_pyramid_region_tracker" "./libmv/tracking/pyramid_region_tracker_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") - blender_add_test_executable("libmv_parallel_for" "./libmv/threading/parallel_for_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;extern_ceres") + blender_add_test_executable("libmv_predict_tracks" "./libmv/autotrack/predict_tracks_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_tracks" "./libmv/autotrack/tracks_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_scoped_ptr" "./libmv/base/scoped_ptr_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_vector" "./libmv/base/vector_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_array_nd" "./libmv/image/array_nd_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_convolve" "./libmv/image/convolve_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_image" "./libmv/image/image_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_sample" "./libmv/image/sample_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_tuple" "./libmv/image/tuple_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_euclidean_resection" "./libmv/multiview/euclidean_resection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_fundamental" "./libmv/multiview/fundamental_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_homography" "./libmv/multiview/homography_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_nviewtriangulation" "./libmv/multiview/nviewtriangulation_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_panography" "./libmv/multiview/panography_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_projection" "./libmv/multiview/projection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_resection" "./libmv/multiview/resection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_triangulation" "./libmv/multiview/triangulation_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_dogleg" "./libmv/numeric/dogleg_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_function_derivative" "./libmv/numeric/function_derivative_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_levenberg_marquardt" "./libmv/numeric/levenberg_marquardt_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_numeric" "./libmv/numeric/numeric_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_poly" "./libmv/numeric/poly_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_camera_intrinsics" "./libmv/simple_pipeline/camera_intrinsics_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_detect" "./libmv/simple_pipeline/detect_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_intersect" "./libmv/simple_pipeline/intersect_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_keyframe_selection" "./libmv/simple_pipeline/keyframe_selection_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_modal_solver" "./libmv/simple_pipeline/modal_solver_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_resect" "./libmv/simple_pipeline/resect_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_brute_region_tracker" "./libmv/tracking/brute_region_tracker_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_klt_region_tracker" "./libmv/tracking/klt_region_tracker_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_pyramid_region_tracker" "./libmv/tracking/pyramid_region_tracker_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") + blender_add_test_executable("libmv_parallel_for" "./libmv/threading/parallel_for_test.cc" "${INC}" "${INC_SYS}" "libmv_test_dataset;bf_intern_libmv;${LIB}") endif() else() list(APPEND SRC diff --git a/intern/quadriflow/CMakeLists.txt b/intern/quadriflow/CMakeLists.txt index 5aef735fc7e..01aa9f8be73 100644 --- a/intern/quadriflow/CMakeLists.txt +++ b/intern/quadriflow/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC set(INC_SYS ../../extern/quadriflow/src - ${EIGEN3_INCLUDE_DIRS} ) set(SRC @@ -18,6 +17,7 @@ set(SRC set(LIB PRIVATE bf::intern::guardedalloc + PRIVATE bf::dependencies::eigen extern_quadriflow ) diff --git a/intern/slim/CMakeLists.txt b/intern/slim/CMakeLists.txt index 3168a8ea65a..528b7b2d1b5 100644 --- a/intern/slim/CMakeLists.txt +++ b/intern/slim/CMakeLists.txt @@ -11,7 +11,6 @@ set(INC ) set(INC_SYS - ${EIGEN3_INCLUDE_DIRS} ) set(SRC @@ -36,6 +35,7 @@ set(SRC ) set(LIB + PRIVATE bf::dependencies::eigen ) blender_add_lib(bf_intern_slim "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 4010b729a41..ba2ca75ffd0 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -15,7 +15,6 @@ set(INC_SYS ../../../extern/wcwidth ../../../extern/json/include - ${EIGEN3_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${ZSTD_INCLUDE_DIRS} ) @@ -422,6 +421,7 @@ set(LIB PRIVATE bf::intern::atomic PRIVATE extern_fmtlib PUBLIC bf::dependencies::optional::tbb + PRIVATE bf::dependencies::eigen ${ZLIB_LIBRARIES} ${ZSTD_LIBRARIES} ) diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt index 8d232655c71..7aafa16cdb9 100644 --- a/source/blender/ikplugin/CMakeLists.txt +++ b/source/blender/ikplugin/CMakeLists.txt @@ -48,7 +48,6 @@ if(WITH_IK_ITASC) ../../../intern/itasc ) list(APPEND INC_SYS - ${EIGEN3_INCLUDE_DIRS} ) list(APPEND SRC intern/itasc_plugin.cc diff --git a/source/blender/render/hydra/CMakeLists.txt b/source/blender/render/hydra/CMakeLists.txt index 955661ee0e0..33952de3d73 100644 --- a/source/blender/render/hydra/CMakeLists.txt +++ b/source/blender/render/hydra/CMakeLists.txt @@ -61,7 +61,6 @@ set(INC_SYS ${BOOST_INCLUDE_DIR} ${TBB_INCLUDE_DIR} ${GFLAGS_INCLUDE_DIRS} - ${EIGEN3_INCLUDE_DIRS} ) set(LIB @@ -76,6 +75,7 @@ set(LIB PRIVATE bf::intern::clog bf_io_usd PRIVATE bf::nodes + PRIVATE bf::dependencies::eigen ) set(SRC diff --git a/source/blender/simulation/CMakeLists.txt b/source/blender/simulation/CMakeLists.txt index 7ec4d4d3512..f89734d18d1 100644 --- a/source/blender/simulation/CMakeLists.txt +++ b/source/blender/simulation/CMakeLists.txt @@ -9,7 +9,6 @@ set(INC ) set(INC_SYS - ${EIGEN3_INCLUDE_DIRS} ) set(SRC @@ -34,6 +33,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc PRIVATE bf::nodes + PRIVATE bf::dependencies::eigen )